Add suffix to tempnam()

[neufeind]

Implementation of this RFC:
https://wiki.php.net/rfc/tempnam-suffix

[smalyshev]

This one fails to build with compile error in gd.c.

[neufeind]

Can't say why gd.c should be a problem here. Worked fine for me. I only had problems with the unittest but didn't find out which mismatch it has in actual/expected output. The output of the testscript itself looks fine to me.

Would be great if somebody could pick this up.

[Tyrael]

travis still tells me that this PR breaks the build:
https://travis-ci.org/php/php-src/builds/17938665
I will try to look verify this later yesterday.

[Tyrael]

oh, right, you simply missed the php_open_temporary_file() usage in ext/gd.c .
could you please also update that?

[php-pulls]

*ext/gd/gd.c
2014.02.20. 11:34, "Ferenc Kovacs" notifications@github.com ezt írta:

oh, right, you simply missed the php_open_temporary_file() usage in
ext/gd.c .
could you please also update that?

—
Reply to this email directly or view it on GitHubhttps://github.com//pull/575#issuecomment-35607450
.

[neufeind]

had no gd-devel installed, thus gd got disabled during build and I didn't notice it. Thanks for the feedback.

[neufeind]

Still something broken? This is a neverending story :-(

[Tyrael]

Starting program: /Users/tyrael/checkouts/php-src.git/./sapi/cli/php ext/gd/tests/bug41442.php

Program received signal SIGSEGV, Segmentation fault.
0x00007fff929bc812 in ?? ()
(gdb) bt
#0 0x00007fff929bc812 in ?? ()
#1 0x00007fff5fbfd120 in ?? ()
#2 0x000000010024c16f in php_do_open_temporary_file (path=0x0, pfx=0x100495e9b "%s%s%sXXXXXX%s", suffix=0x2101245250 <Address 0x2101245250 out of bounds>, opened_path_p=0x7fff5fbfcba0, tsrm_ls=0x7fff5fbfcca8) at main/php_open_temporary_file.c:161
Backtrace stopped: frame did not save the PC

caused by this line:
if (spprintf(&opened_path, 0, "%s%s%sXXXXXX%s", new_state.cwd, trailing_slash, pfx, suffix) >= MAXPATHLEN) {

I think it is caused by the fact that we allow the NULL pointer to reach all the way here, and spprintf %s expects a null terminated string argument.

[Tyrael]

this simple patch solves the segfault, but it would be nice if somebody else could approve this:

diff --git a/main/php_open_temporary_file.c b/main/php_open_temporary_file.c
index 67d158e..6bdd5cb 100644
--- a/main/php_open_temporary_file.c
+++ b/main/php_open_temporary_file.c
@@ -275,6 +275,9 @@ PHPAPI int php_open_temporary_fd_ex(const char *dir, const char *pfx, char **ope
        if (opened_path_p) {
                *opened_path_p = NULL;
        }
+       if (!suffix) {
+               suffix = "";
+       }

        if (!dir || *dir == '\0') {
 def_tmp:

[nikic]

@Tyrael You need to indent the patch with four spaces or wrap it in ``` to properly format it.

[Tyrael]

ah, thanks.

[neufeind]

Could somebody maybe update the patch and review this? At least I hope we're close ...

[Tyrael]

neufeind: only you can update the patch in the pull request.
and unfortunately, we are in feature freeze mode now, so I don't think this can make into 5.6.0 :(

[smalyshev]

Also this has a binary API change in php_open_temporary_file, so unless it's in 5.6.0, it can not be in 5.6 branch at all.

[ghost]

Can one of the admins verify this patch?

[neufeind]

It seems to need some adjustment, but I'm not sure how to continue with it / track that down. A test fails - but how do I debug that?

[Tyrael]

if you still want to pursue this, please create a new PR

[neufeind]

I still didn't find out how to track down the failing test. The patch itself worked afaik but my tries (as a php-src-newbie) to find help unfortunately lead nowhere :-(