[xmlrpc-c/f16] forward-ported patch from stable branch which fixes exception handling on invalid utf-8 strings

ensc ensc at fedoraproject.org
Sun Aug 26 14:53:12 UTC 2012


commit 27fe80a4958960492a024198007f6007638fb1ae
Author: Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
Date:   Sun Aug 26 16:51:46 2012 +0200

    forward-ported patch from stable branch which fixes exception handling
    on invalid utf-8 strings

 fix-string-exceptions.patch |   23 +++++++++++++++++++++++
 xmlrpc-c.spec               |    8 +++++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/fix-string-exceptions.patch b/fix-string-exceptions.patch
new file mode 100644
index 0000000..794505d
--- /dev/null
+++ b/fix-string-exceptions.patch
@@ -0,0 +1,23 @@
+commit e843bfc560ec7baabf9f88421ecdd1826e9fb578
+Author: giraffedata <giraffedata at adbb7d4b-a73a-0410-a071-c5f57c452bd4>
+Date:   Wed Aug 22 03:18:22 2012 +0000
+
+    Release 1.25.19
+    
+    git-svn-id: https://xmlrpc-c.svn.sourceforge.net/svnroot/xmlrpc-c/stable@2385 adbb7d4b-a73a-0410-a071-c5f57c452bd4
+
+diff --git a/src/xmlrpc_string.c b/src/xmlrpc_string.c
+index ac9a1f5..9496bfa 100644
+--- a/src/xmlrpc_string.c
++++ b/src/xmlrpc_string.c
+@@ -673,6 +673,10 @@ stringNew(xmlrpc_env *     const envP,
+ 
+     xmlrpc_value * valP;
+ 
++    // hack to work around old-style exception cleanup in
++    // convert_params() in xmlrpc_parse.c.
++    valP = NULL;
++
+     xmlrpc_validate_utf8(envP, value, length);
+ 
+     if (!envP->fault_occurred) {
diff --git a/xmlrpc-c.spec b/xmlrpc-c.spec
index 12ace72..4af08f5 100644
--- a/xmlrpc-c.spec
+++ b/xmlrpc-c.spec
@@ -6,7 +6,7 @@
 Summary:	A lightweight RPC library based on XML and HTTP
 Name:		xmlrpc-c
 Version:	1.27.7
-Release:	%release_func 1602.svn%svnrev
+Release:	%release_func 1603.svn%svnrev
 # See COPYING for details.
 # The Python 1.5.2 license used by a few files is just BSD.
 License:	BSD and MIT
@@ -24,6 +24,7 @@ Source101:	dso-fixup
 Patch0:		xmlrpc-boolean-meaning.patch
 Patch2:		ipv6-parse.patch
 Patch3:		fix-double-free.patch
+Patch4:		fix-string-exceptions.patch
 
 Patch100:	xmlrpc-c-cmake.patch
 Patch102:	xmlrpc-c-printf-size_t.patch
@@ -121,6 +122,7 @@ This package contains some handy XML-RPC demo applications.
 %patch0 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %patch100 -p1
 %patch102 -p1
@@ -248,6 +250,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Aug 26 2012 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.27.7-1603.svn2185
+- forward-ported patch from stable branch which fixes exception
+  handling on invalid utf-8 strings
+
 * Wed Jun  6 2012 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 1.27.7-1602.svn2185
 - backported "Fix double free of memory with failed xmlrpc_parse_value()"
   patch


More information about the scm-commits mailing list