com php-src: Fix memory error in spl_directory.c: ext/s pl/spl_directory.c

From: Date: Mon, 12 May 2014 19:35:39 +0000
Subject: com php-src: Fix memory error in spl_directory.c: ext/s pl/spl_directory.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-78293@lists.php.net to get a copy of this message
Commit: 9f9ee0186eb3d1fcc2b3a4ecc55a0195233fd670 Author: Nikita Popov <nikic@php.net> Mon, 12 May 2014 21:35:39 +0200 Parents: 8904f72d7c47253345f7039afd8ca754442c7e34 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9f9ee0186eb3d1fcc2b3a4ecc55a0195233fd670 Log: Fix memory error in spl_directory.c Changed paths: M ext/spl/spl_directory.c Diff: diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c index f7a1de4..ca7baf2 100644 --- a/ext/spl/spl_directory.c +++ b/ext/spl/spl_directory.c @@ -386,7 +386,7 @@ void spl_filesystem_info_set_filename(spl_filesystem_object *intern, char *path, intern->file_name = use_copy ? estrndup(path, len) : path; intern->file_name_len = len; - while (IS_SLASH_AT(intern->file_name, intern->file_name_len-1) && intern->file_name_len > 1) { + while (intern->file_name_len > 1 && IS_SLASH_AT(intern->file_name, intern->file_name_len-1)) { intern->file_name[intern->file_name_len-1] = 0; intern->file_name_len--; }

« previous php.cvs (#78293) next »