From: Nikita Popov <nikic@php.net>
Date: Mon, 12 May 2014 19:35:39 +0000 (+0200)
Subject: Fix memory error in spl_directory.c
X-Git-Tag: POST_PHPNG_MERGE~380^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9f9ee0186eb3d1fcc2b3a4ecc55a0195233fd670;p=php

Fix memory error in spl_directory.c
---

diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index f7a1de4c07..ca7baf2226 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--;
 	}