rpms/compat-wxGTK26/devel wxGTK-2.6.3-strconv.patch, NONE, 1.1 compat-wxGTK26.spec, 1.8, 1.9

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/compat-wxGTK26/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17276

Modified Files:
	compat-wxGTK26.spec 
Added Files:
	wxGTK-2.6.3-strconv.patch 
Log Message:
* Fri Sep 14 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.6.3-8
- Patch some dangerous pointer dereferences in src/common/strconv.cpp.


wxGTK-2.6.3-strconv.patch:

--- NEW FILE wxGTK-2.6.3-strconv.patch ---
diff -Nur wxGTK-2.6.3-orig/src/common/strconv.cpp wxGTK-2.6.3/src/common/strconv.cpp
--- wxGTK-2.6.3-orig/src/common/strconv.cpp	2006-03-22 00:42:11.000000000 +0100
+++ wxGTK-2.6.3/src/common/strconv.cpp	2007-09-14 12:08:01.000000000 +0200
@@ -194,7 +194,7 @@
         }
     }
 
-    wxWCharBuffer buf((wchar_t *)NULL);
+    wxWCharBuffer buf((size_t)0);
 
     return buf;
 }
@@ -215,7 +215,7 @@
         }
     }
 
-    wxCharBuffer buf((char *)NULL);
+    wxCharBuffer buf((size_t)0);
 
     return buf;
 }
@@ -773,7 +773,7 @@
             len++;
         }
         else if ( (m_options & MAP_INVALID_UTF8_TO_OCTAL)
-                    && cc == L'\\' && psz[0] == L'\\' )
+                    && cc == L'\\' && *psz && psz[0] == L'\\' )
         {
             if (buf)
                 *buf++ = (char)cc;
@@ -782,6 +782,7 @@
         }
         else if ( (m_options & MAP_INVALID_UTF8_TO_OCTAL) &&
                     cc == L'\\' &&
+                  *psz && *(psz+1) && *(psz+2) &&
                         isoctal(psz[0]) && isoctal(psz[1]) && isoctal(psz[2]) )
         {
             if (buf)


Index: compat-wxGTK26.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-wxGTK26/devel/compat-wxGTK26.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- compat-wxGTK26.spec	28 Aug 2007 09:58:52 -0000	1.8
+++ compat-wxGTK26.spec	14 Sep 2007 11:16:28 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           compat-wxGTK26
 Version:        2.6.3
-Release:        7
+Release:        8
 Summary:        GTK2 port of the wxWidgets GUI library
 # The wxWindows licence is the LGPL with a specific exemption allowing
 # distribution of derived binaries under any terms. (This will eventually
@@ -15,6 +15,7 @@
 Patch3:         wxGTK-2.6.3-g_thread_init.patch
 #Patch4:         wxGTK-2.6.3-tooltips.patch
 Patch5:         wxGTK-2.6.3-expat2.patch
+Patch6:         wxGTK-2.6.3-strconv.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel, zlib-devel >= 1.1.4
@@ -54,6 +55,7 @@
 %patch3 -p1 -b .g_thread_init
 #patch4 -p1 -b .tooltips
 %patch5 -p1 -b .expat2
+%patch6 -p1 -b .strconv
 
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
@@ -160,6 +162,9 @@
 
 
 %changelog
+* Fri Sep 14 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.6.3-8
+- Patch some dangerous pointer dereferences in src/common/strconv.cpp.
+
 * Tue Aug 28 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.6.3-7
 - rebuilt for new expat (#195888)