glib r7123 - in trunk: . glib/pcre

[matthiasc svn gnome org]

Author: matthiasc
Date: Tue Jul  1 03:27:14 2008
New Revision: 7123
URL: http://svn.gnome.org/viewvc/glib?rev=7123&view=rev

Log:
        * glib/pcre/pcre_compile.c: Apply fix for CVE-2008-2371 to
        fix a heap-based buffer overflow.




Modified:
   trunk/ChangeLog
   trunk/glib/pcre/pcre_compile.c

Modified: trunk/glib/pcre/pcre_compile.c
==============================================================================
--- trunk/glib/pcre/pcre_compile.c	(original)
+++ trunk/glib/pcre/pcre_compile.c	Tue Jul  1 03:27:14 2008
@@ -4807,7 +4807,7 @@
                (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE))
             {
             cd->external_options = newoptions;
-            options = newoptions;
+            options = *optionsptr = newoptions;
             }
          else
             {