[Frugalware-darcs] frugalware-current: gdb-6.5-4-x86_64

AlexExtreme alex at alex-smith.me.uk
Tue Oct 31 20:36:34 CET 2006


Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-current;a=darcs_commitdiff;h=20061031193359-46e39-ae61f48604169e21ce40f2f8034d5fc68ac4f843.gz;

[gdb-6.5-4-x86_64
AlexExtreme <alex at alex-smith.me.uk>**20061031193359
  * Release bump again :)
  * Fixed crashes caused by secfix patch - Fedora had an updated patch fixing this
] {
hunk ./source/devel/gdb/FrugalBuild 7
-pkgrel=3
+pkgrel=4
hunk ./source/devel/gdb/FrugalBuild 21
-	  'f557135474b2c3ae57448e0cce709142887f48d1' \
+	  '0cb79437a6297ad18fad68288006e402581627e3' \
hunk ./source/devel/gdb/gdb-cve-2006-4146-sec.patch 1
-diff -Naur gdb-6.5.orig/gdb/dwarf2read.c gdb-6.5/gdb/dwarf2read.c
---- gdb-6.5.orig/gdb/dwarf2read.c	2006-09-04 15:34:23.000000000 +0200
-+++ gdb-6.5/gdb/dwarf2read.c	2006-09-04 15:42:43.000000000 +0200
-@@ -8855,6 +8855,17 @@
+for gdb/ChangeLog:
+2006-08-22  Will Drewry <wad at google.com>
+	    Tavis Ormandy <taviso at google.com>
+
+	* dwarf2read.c (decode_locdesc): Enforce location description stack
+	boundaries.
+	* dwarfread.c (locval): Likewise.
+
+Index: gdb-6.5/gdb/dwarf2read.c
+===================================================================
+--- gdb-6.5.orig/gdb/dwarf2read.c	2006-09-04 02:02:23.000000000 -0300
++++ gdb-6.5/gdb/dwarf2read.c	2006-09-04 02:02:23.000000000 -0300
+@@ -8667,8 +8667,7 @@ dwarf2_fundamental_type (struct objfile 
+    callers will only want a very basic result and this can become a
+    complaint.
+ 
+-   Note that stack[0] is unused except as a default error return.
+-   Note that stack overflow is not yet handled.  */
++   Note that stack[0] is unused except as a default error return. */
+ 
+ static CORE_ADDR
+ decode_locdesc (struct dwarf_block *blk, struct dwarf2_cu *cu)
+@@ -8685,7 +8684,7 @@ decode_locdesc (struct dwarf_block *blk,
+ 
+   i = 0;
+   stacki = 0;
+-  stack[stacki] = 0;
++  stack[++stacki] = 0;
+ 
+   while (i < size)
+     {
+@@ -8864,6 +8863,16 @@ decode_locdesc (struct dwarf_block *blk,
hunk ./source/devel/gdb/gdb-cve-2006-4146-sec.patch 36
-+
-+        /* Enforce maximum stach depth of 63 to avoid ++stacki writing
-+           outside of the gives size. Also enforce minimum > 0.
-+           -- wad at google.com 14 Aug 2006 */
-+        if (stacki >= sizeof(stack)/sizeof(*stack) - 1)
-+          internal_error (__FILE__, __LINE__,
-+                            _("location description stack too deep: %d"),
-+                            stacki);
-+        if (stacki <= 0)
-+          internal_error (__FILE__, __LINE__,
-+                            _("location description stack too shallow"));
++      /* Enforce maximum stack depth of size-1 to avoid ++stacki writing
++         outside of the allocated space. Also enforce minimum > 0.
++         -- wad at google.com 14 Aug 2006 */
++      if (stacki >= sizeof (stack) / sizeof (*stack) - 1)
++	internal_error (__FILE__, __LINE__,
++	                _("location description stack too deep: %d"),
++	                stacki);
++      if (stacki <= 0)
++	internal_error (__FILE__, __LINE__,
++	                _("location description stack too shallow"));
hunk ./source/devel/gdb/gdb-cve-2006-4146-sec.patch 49
-diff -Naur gdb-6.5.orig/gdb/dwarfread.c gdb-6.5/gdb/dwarfread.c
---- gdb-6.5.orig/gdb/dwarfread.c	2006-09-04 15:34:23.000000000 +0200
-+++ gdb-6.5/gdb/dwarfread.c	2006-09-04 15:39:44.000000000 +0200
-@@ -2224,6 +2224,16 @@
+Index: gdb-6.5/gdb/dwarfread.c
+===================================================================
+--- gdb-6.5.orig/gdb/dwarfread.c	2005-12-17 20:33:59.000000000 -0200
++++ gdb-6.5/gdb/dwarfread.c	2006-09-04 02:02:23.000000000 -0300
+@@ -2138,9 +2138,7 @@ decode_line_numbers (char *linetable)
+ 
+    NOTES
+ 
+-   Note that stack[0] is unused except as a default error return.
+-   Note that stack overflow is not yet handled.
+- */
++   Note that stack[0] is unused except as a default error return. */
+ 
+ static int
+ locval (struct dieinfo *dip)
+@@ -2160,7 +2158,7 @@ locval (struct dieinfo *dip)
+   loc += nbytes;
+   end = loc + locsize;
+   stacki = 0;
+-  stack[stacki] = 0;
++  stack[++stacki] = 0;
+   dip->isreg = 0;
+   dip->offreg = 0;
+   dip->optimized_out = 1;
+@@ -2224,6 +2222,16 @@ locval (struct dieinfo *dip)
hunk ./source/devel/gdb/gdb-cve-2006-4146-sec.patch 77
-+        /* Enforce maximum stack depth of 63 to avoid ++stacki writing
-+           outside of the given size. Also enforce minimum > 0.
-+           -- wad at google.com 14 Aug 2006 */
-+        if (stacki >= sizeof(stack)/sizeof(*stack) - 1)
-+          internal_error (__FILE__, __LINE__,
-+                            _("location description stack too deep: %d"),
-+                            stacki);
-+        if (stacki <= 0)
-+          internal_error (__FILE__, __LINE__,
-+                            _("location description stack too shallow"));
++      /* Enforce maximum stack depth of size-1 to avoid ++stacki writing
++         outside of the allocated space. Also enforce minimum > 0.
++         -- wad at google.com 14 Aug 2006 */
++      if (stacki >= sizeof (stack) / sizeof (*stack) - 1)
++	internal_error (__FILE__, __LINE__,
++	                _("location description stack too deep: %d"),
++	                stacki);
++      if (stacki <= 0)
++	internal_error (__FILE__, __LINE__,
++	                _("location description stack too shallow"));
}


More information about the Frugalware-darcs mailing list