2011-06-15 Hui Zhu <teawater@gmail.com>

	* remote.c (remote_trace_set_readonly_regions): Add a check for
	target_buf_size.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 85ac0bbc675ca7bb9beaef8926f4a78f086c9129..3ea164c953dc079869b62f22a3884a7e2f1e9a04 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-15  Hui Zhu  <teawater@gmail.com>
+
+       * remote.c (remote_trace_set_readonly_regions): Add a check for
+       target_buf_size.
+
 2011-06-10  Jan Kratochvil  <jan.kratochvil@redhat.com>
 
        * symtab.c (output_partial_symbol_filename): Exchange the filename and

diff --git a/gdb/remote.c b/gdb/remote.c
index 18c8a05e9c8476f62513ef044511a51ef0c78c2f..7263cd9d46429709ee88d71f446c4f742fc58658 100644 (file)
--- a/gdb/remote.c
+++ b/gdb/remote.c
@@ -9922,6 +9922,7 @@ remote_trace_set_readonly_regions (void)
   bfd_size_type size;
   bfd_vma vma;
   int anysecs = 0;
+  int offset = 0;
 
   if (!exec_bfd)
     return;                    /* No information to give.  */
@@ -9930,6 +9931,7 @@ remote_trace_set_readonly_regions (void)
   for (s = exec_bfd->sections; s; s = s->next)
     {
       char tmp1[40], tmp2[40];
+      int sec_length;
 
       if ((s->flags & SEC_LOAD) == 0 ||
       /*  (s->flags & SEC_CODE) == 0 || */
@@ -9941,8 +9943,15 @@ remote_trace_set_readonly_regions (void)
       size = bfd_get_section_size (s);
       sprintf_vma (tmp1, vma);
       sprintf_vma (tmp2, vma + size);
-      sprintf (target_buf + strlen (target_buf), 
-              ":%s,%s", tmp1, tmp2);
+      sec_length = 1 + strlen (tmp1) + 1 + strlen (tmp2);
+      if (offset + sec_length + 1 > target_buf_size)
+       {
+         warning (_("\
+Too many sections for read-only sections definition packet."));
+         break;
+       }
+      sprintf (target_buf + offset, ":%s,%s", tmp1, tmp2);
+      offset += sec_length;
     }
   if (anysecs)
     {