wez Sat Nov 16 18:35:30 2002 EDT
Modified files: (Branch: PHP_4_3)
/php4/main streams.c
Log:
initialize this member so that it doesn't segfault on shutdown...
Index: php4/main/streams.c
diff -u php4/main/streams.c:1.125.2.5 php4/main/streams.c:1.125.2.6
--- php4/main/streams.c:1.125.2.5 Sat Nov 16 17:59:55 2002
+++ php4/main/streams.c Sat Nov 16 18:35:30 2002
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: streams.c,v 1.125.2.5 2002/11/16 22:59:55 wez Exp $ */
+/* $Id: streams.c,v 1.125.2.6 2002/11/16 23:35:30 wez Exp $ */
#define _GNU_SOURCE
#include "php.h"
@@ -1250,7 +1250,7 @@
self->file = file;
self->is_pipe = 0;
self->is_process_pipe = 0;
-
+ self->temp_file_name = NULL;
self->fd = fileno(file);
#ifdef S_ISFIFO
@@ -1273,6 +1273,7 @@
self->is_pipe = 1;
self->is_process_pipe = 1;
self->fd = fileno(file);
+ self->temp_file_name = NULL;
return php_stream_alloc_rel(&php_stream_stdio_ops, self, 0, mode);
}
@@ -1342,6 +1343,7 @@
ret = fclose(data->file);
}
if (data->temp_file_name) {
+ printf("temp: %s\n", data->temp_file_name);
unlink(data->temp_file_name);
efree(data->temp_file_name);
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php