Add patch for conversion from int to usnigned char

This commit is contained in:
Mikolaj Izdebski 2016-02-16 08:42:13 +01:00
parent 9b508d46df
commit e0d259d271
2 changed files with 40 additions and 0 deletions

View File

@ -0,0 +1,34 @@
--- xmlrpc-c-1.32.5/src/cpp/base64.cpp~ 2010-05-21 00:52:29.000000000 +0200
+++ xmlrpc-c-1.32.5/src/cpp/base64.cpp 2016-02-16 08:37:43.874552656 +0100
@@ -15,14 +15,14 @@
namespace {
char const table_a2b_base64[] = {
- -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
- -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
- -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,62, -1,-1,-1,63,
- 52,53,54,55, 56,57,58,59, 60,61,-1,-1, -1, 0,-1,-1, /* Note PAD->0 */
- -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10, 11,12,13,14,
- 15,16,17,18, 19,20,21,22, 23,24,25,-1, -1,-1,-1,-1,
- -1,26,27,28, 29,30,31,32, 33,34,35,36, 37,38,39,40,
- 41,42,43,44, 45,46,47,48, 49,50,51,-1, -1,-1,-1,-1
+ 64,64,64,64, 64,64,64,64, 64,64,64,64, 64,64,64,64,
+ 64,64,64,64, 64,64,64,64, 64,64,64,64, 64,64,64,64,
+ 64,64,64,64, 64,64,64,64, 64,64,64,62, 64,64,64,63,
+ 52,53,54,55, 56,57,58,59, 60,61,64,64, 64, 0,64,64, /* Note PAD->0 */
+ 64, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10, 11,12,13,14,
+ 15,16,17,18, 19,20,21,22, 23,24,25,64, 64,64,64,64,
+ 64,26,27,28, 29,30,31,32, 33,34,35,36, 37,38,39,40,
+ 41,42,43,44, 45,46,47,48, 49,50,51,64, 64,64,64,64
};
char const base64Pad('=');
@@ -210,7 +210,7 @@
buffer.discardResidue();
} else {
unsigned int const tableIndex(thisChar);
- if (table_a2b_base64[tableIndex] == -1)
+ if (table_a2b_base64[tableIndex] == 64)
throwf("Contains non-base64 character "
"with ASCII code 0x%02x", thisChar);

View File

@ -29,6 +29,7 @@ Patch108: xmlrpc-c-30x-redirect.patch
Patch109: xmlrpc-c-check-vasprintf-return-value.patch
Patch110: xmlrpc-c-include-string_int.h.patch
Patch111: xmlrpc-c-format-security-warning.patch
Patch112: xmlrpc-c-int-to-char-conversion.patch
BuildRoot: %_tmppath/%name-%version-%release-root
@ -125,6 +126,7 @@ This package contains some handy XML-RPC demo applications.
%patch109 -p1
%patch110 -p1
%patch111 -p1
%patch112 -p1
## not needed...
rm doc/{INSTALL,configure_doc}
@ -244,6 +246,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Tue Feb 16 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.32.5-1909.svn2451
- Add patch for conversion from int to usnigned char
- Resolves: rhbz#1308254
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.32.5-1909.svn2451
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild