]> granicus.if.org Git - php/commitdiff
MFB: Fixed handling of extremely long paths inside tempnam() function.
authorIlia Alshanetsky <iliaa@php.net>
Tue, 23 May 2006 23:22:16 +0000 (23:22 +0000)
committerIlia Alshanetsky <iliaa@php.net>
Tue, 23 May 2006 23:22:16 +0000 (23:22 +0000)
main/php_open_temporary_file.c

index 66453581fb8ddced95cde02df020443cd1c7ce1c..b2e27e2f79ed8d1f2bec391f0b40732b4f6810d4 100644 (file)
@@ -114,17 +114,16 @@ static int php_do_open_temporary_file(const char *path, const char *pfx, char **
 
        path_len = strlen(path);
 
-       if (!(opened_path = emalloc(MAXPATHLEN))) {
-               return -1;
-       }
-
        if (!path_len || IS_SLASH(path[path_len - 1])) {
                trailing_slash = "";
        } else {
                trailing_slash = "/";
        }
 
-       (void)snprintf(opened_path, MAXPATHLEN, "%s%s%sXXXXXX", path, trailing_slash, pfx);
+       if (spprintf(&opened_path, 0, "%s%s%sXXXXXX", path, trailing_slash, pfx) >= MAXPATHLEN) {
+               efree(opened_path);
+               return -1;
+       }
 
 #ifdef PHP_WIN32
        if (GetTempFileName(path, pfx, 0, opened_path)) {