]> granicus.if.org Git - php/commitdiff
Fix memory error in spl_directory.c
authorNikita Popov <nikic@php.net>
Mon, 12 May 2014 19:35:39 +0000 (21:35 +0200)
committerNikita Popov <nikic@php.net>
Mon, 12 May 2014 19:35:39 +0000 (21:35 +0200)
ext/spl/spl_directory.c

index f7a1de4c07ba7e9d101de72c47651050d28d3131..ca7baf2226d672a5f33f9dc233f7b0c5b51d0179 100644 (file)
@@ -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--;
        }