archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed bug #41285 (Improved fix for CVE-2007-1887 to work with non-bundled

Browse source 
sqlite2 lib).
This commit is contained in:
Ilia Alshanetsky 2007-05-05 15:36:15 +00:00
parent c70105610a
commit 502d68e1e7
3 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -6,6 +6,8 @@ PHP NEWS
- Fixed altering $this via argument named "this". (Dmitry) - Fixed altering $this via argument named "this". (Dmitry)
- Fixed bug #41287 (Namespace functions don't allow xmlns defintion to be - Fixed bug #41287 (Namespace functions don't allow xmlns defintion to be
optional). (Rob) optional). (Rob)
- Fixed bug #41285 (Improved fix for CVE-2007-1887 to work with non-bundled
sqlite2 lib). (Ilia)
- Fixed bug #41283 (Bug with serializing array key that are doubles or - Fixed bug #41283 (Bug with serializing array key that are doubles or
floats). (Ilia) floats). (Ilia)
- Fixed bug #41257: (lookupNamespaceURI does not work as expected). (Rob) - Fixed bug #41257: (lookupNamespaceURI does not work as expected). (Rob)

10
ext/sqlite/sess_sqlite.c
View file

@ -110,9 +110,13 @@ PS_READ_FUNC(sqlite)
case SQLITE_ROW: case SQLITE_ROW:
if (rowdata[0] != NULL) { if (rowdata[0] != NULL) {
*vallen = strlen(rowdata[0]); *vallen = strlen(rowdata[0]);
*val = emalloc(*vallen); if (*vallen) {
*vallen = sqlite_decode_binary(rowdata[0], *val); *val = emalloc(*vallen);
(*val)[*vallen] = '\0'; *vallen = sqlite_decode_binary(rowdata[0], *val);
(*val)[*vallen] = '\0';
} else {
*val = STR_EMPTY_ALLOC();
}
} }
break; break;
default: default:

2
ext/sqlite/sqlite.c
View file

@ -73,7 +73,7 @@ extern int sqlite_encode_binary(const unsigned char *in, int n, unsigned char *o
extern int sqlite_decode_binary(const unsigned char *in, unsigned char *out); extern int sqlite_decode_binary(const unsigned char *in, unsigned char *out);
#define php_sqlite_encode_binary(in, n, out) sqlite_encode_binary((const unsigned char *)in, n, (unsigned char *)out) #define php_sqlite_encode_binary(in, n, out) sqlite_encode_binary((const unsigned char *)in, n, (unsigned char *)out)
#define php_sqlite_decode_binary(in, out) sqlite_decode_binary((const unsigned char *)in, (unsigned char *)out) #define php_sqlite_decode_binary(in, out) in && *in ? sqlite_decode_binary((const unsigned char *)in, (unsigned char *)out) : 0
static int sqlite_count_elements(zval *object, long *count TSRMLS_DC); static int sqlite_count_elements(zval *object, long *count TSRMLS_DC);