From: Ilia Alshanetsky <iliaa@php.net>
Date: Sun, 31 Dec 2006 22:26:06 +0000 (+0000)
Subject: MFB: Added boundary checks to php_binary deserializer
X-Git-Tag: RELEASE_1_0_0RC1~444
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=15f16925728dd6e43ab718ceb9e58c0eb60aa132;p=php

MFB: Added boundary checks to php_binary deserializer
---

diff --git a/ext/session/session.c b/ext/session/session.c
index 9363e70bc8..e86dcd5dc4 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -384,6 +384,11 @@ PS_SERIALIZER_DECODE_FUNC(php_binary)
 	for (p = val; p < endptr; ) {
 		zval **tmp;
 		namelen = *p & (~PS_BIN_UNDEF);
+
+		if (namelen > PS_BIN_MAX || (p + namelen) >= endptr) {
+			return FAILURE;
+		}
+
 		has_value = *p & PS_BIN_UNDEF ? 0 : 1;
 
 		name = estrndup(p + 1, namelen);