From: Dmitry Stogov <dmitry@php.net>
Date: Mon, 9 Jul 2007 13:43:50 +0000 (+0000)
Subject: Fixed deserialization of escaped strings
X-Git-Tag: BEFORE_IMPORT_OF_MYSQLND~290
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e99224ca668cd007ce2b8ea385172b9fbe499691;p=php

Fixed deserialization of escaped strings
---

diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c
index 2fbb38707c..cfb031ff0e 100644
--- a/ext/standard/var_unserializer.c
+++ b/ext/standard/var_unserializer.c
@@ -142,6 +142,7 @@ static char *unserialize_str(const unsigned char **p, int *len)
 					return NULL;
 				}
 			}
+			end += 2;
 			str[i] = (char)ch;
 		}
 		(*p)++;
diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re
index 6fcb156a3f..9f8a028860 100644
--- a/ext/standard/var_unserializer.re
+++ b/ext/standard/var_unserializer.re
@@ -140,6 +140,7 @@ static char *unserialize_str(const unsigned char **p, int *len)
 					return NULL;
 				}
 			}
+			end += 2;
 			str[i] = (char)ch;
 		}
 		(*p)++;