]> granicus.if.org Git - php/commitdiff
Fix invalid read
authorArnaud Le Blanc <lbarnaud@php.net>
Fri, 8 May 2009 09:44:17 +0000 (09:44 +0000)
committerArnaud Le Blanc <lbarnaud@php.net>
Fri, 8 May 2009 09:44:17 +0000 (09:44 +0000)
ext/standard/file.c

index ae4fcb1f4a0760f8ed3aa606cc784654a30f9151..d83f91180505131c29c72a736f7868235c6395c7 100644 (file)
@@ -785,7 +785,7 @@ parse_eol:
                } else {
                        do {
                                int windows_eol = 0;
-                               if (eol_marker == '\n' && *(p - 1) == '\r') {
+                               if (p != target_buf && eol_marker == '\n' && *(p - 1) == '\r') {
                                        windows_eol++;
                                }
                                if (skip_blank_lines && !(p-s-windows_eol)) {