diff options
-rw-r--r-- | ext/standard/var_unserializer.c | 6 | ||||
-rw-r--r-- | ext/standard/var_unserializer.re | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c index 4844e3cc13..c431f53b0a 100644 --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.11.0 on Fri Mar 23 20:26:08 2007 */ +/* Generated by re2c 0.11.2 on Tue Mar 27 13:17:43 2007 */ #line 1 "ext/standard/var_unserializer.re" /* +----------------------------------------------------------------------+ @@ -144,7 +144,7 @@ static char *unserialize_str(const unsigned char **p, size_t *len) { size_t i, j; char *str = safe_emalloc(*len, 1, 1); - unsigned char *end = *p+*len; + unsigned char *end = *(unsigned char **)p+*len; if(end < *p) { efree(str); @@ -394,7 +394,7 @@ PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER) { - static unsigned char yybm[] = { + static const unsigned char yybm[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re index 072f6e86a0..59f755c548 100644 --- a/ext/standard/var_unserializer.re +++ b/ext/standard/var_unserializer.re @@ -142,7 +142,7 @@ static char *unserialize_str(const unsigned char **p, size_t *len) { size_t i, j; char *str = safe_emalloc(*len, 1, 1); - unsigned char *end = *p+*len; + unsigned char *end = *(unsigned char **)p+*len; if(end < *p) { efree(str); |