com php-src: fix invalid read when trimming empty string: ext/filter/filter_private.h

From: Date: Sun, 11 Nov 2012 18:38:14 +0000
Subject: com php-src: fix invalid read when trimming empty string: ext/filter/filter_private.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-70516@lists.php.net to get a copy of this message
Commit: 5b82fb52fd5143a3860db219eb39616c6e642a4b Author: Antony Dovgal <tony2001@php.net> Sun, 11 Nov 2012 22:37:04 +0400 Parents: 964acdaa3527225d06beb8f81724513c9b9dd8dd Branches: PHP-5.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5b82fb52fd5143a3860db219eb39616c6e642a4b Log: fix invalid read when trimming empty string Changed paths: M ext/filter/filter_private.h Diff: diff --git a/ext/filter/filter_private.h b/ext/filter/filter_private.h index 2ec2f62..0f76d7a 100644 --- a/ext/filter/filter_private.h +++ b/ext/filter/filter_private.h @@ -109,8 +109,10 @@ if (len < 1 && return_if_empty) { \ RETURN_VALIDATION_FAILED \ } \ - while (p[len-1] == ' ' || p[len-1] == '\t' || p[len-1] == '\r' || p[len-1] == '\v' || p[len-1] == '\n') { \ - len--; \ + if (len > 0) { \ + while (p[len-1] == ' ' || p[len-1] == '\t' || p[len-1] == '\r' || p[len-1] == '\v' || p[len-1] == '\n') { \ + len--; \ + } \ } \ }

« previous php.cvs (#70516) next »