]> granicus.if.org Git - php/commitdiff
allocate globals, making this work in zts mode
authorSterling Hughes <sterling@php.net>
Sat, 11 May 2002 15:58:55 +0000 (15:58 +0000)
committerSterling Hughes <sterling@php.net>
Sat, 11 May 2002 15:58:55 +0000 (15:58 +0000)
(not that it really matters, since libswf isn't thread safe...)

ext/swf/swf.c

index ccd8955f0eae57b73779743c0d4c6ced60805c51..9a5c792c3f87bc40c73636b92e687a5832589b5c 100644 (file)
@@ -138,10 +138,20 @@ PHP_MINFO_FUNCTION(swf)
 }
 /* }}} */
 
+/* {{{ _swf_init_globals
+ */
+static void _swf_init_globals(zend_swf_globals *sg)
+{
+       memset(sg, 0, sizeof(zend_swf_globals));
+}
+/* }}} */
+
 /* {{{ PHP_MINIT_FUNCTION
  */
 PHP_MINIT_FUNCTION(swf)
 {
+       ZEND_INIT_MODULE_GLOBALS(swf, _swf_init_globals, NULL);
+
        REGISTER_LONG_CONSTANT("MOD_COLOR", MOD_COLOR, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("MOD_MATRIX", MOD_MATRIX, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("TYPE_PUSHBUTTON", TYPE_PUSHBUTTON, CONST_CS | CONST_PERSISTENT);
@@ -162,6 +172,7 @@ PHP_MINIT_FUNCTION(swf)
        REGISTER_LONG_CONSTANT("ButtonExit", ButtonExit, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("MenuEnter", MenuEnter, CONST_CS | CONST_PERSISTENT);
        REGISTER_LONG_CONSTANT("MenuExit", MenuExit, CONST_CS | CONST_PERSISTENT);
+
        return SUCCESS;
 }
 /* }}} */
@@ -262,6 +273,7 @@ PHP_FUNCTION(swf_closefile)
                fclose(f);
                
                VCWD_UNLINK((const char *)SWFG(tmpfile_name));
+               efree(SWFG(tmpfile_name));
        }
 }
 /* }}} */