From: Rasmus Lerdorf <rasmus@php.net>
Date: Thu, 24 May 2007 20:53:05 +0000 (+0000)
Subject: Avoid running off the end of a non-null terminated string.  Not that we
X-Git-Tag: php-5.2.3RC1~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=61b06f1527832ce151de9156766edbdc91949864;p=php

Avoid running off the end of a non-null terminated string.  Not that we
should have any of those, but a mistake in an extension could hit this
and the check doesn't actually make any sense as far as I am concerned.
---

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 56981b0778..1255e8c4d8 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -3016,7 +3016,7 @@ PHPAPI char *php_addcslashes(char *str, int length, int *new_length, int should_
 
 	php_charmask(what, wlength, flags TSRMLS_CC);
 
-	for (source = str, end = source + length, target = new_str; (c = *source) || (source < end); source++) {
+	for (source = str, end = source + length, target = new_str; source < end; source++) {
 		if (flags[(unsigned char)c]) {
 			if ((unsigned char) c < 32 || (unsigned char) c > 126) {
 				*target++ = '\\';