initialized some strings in global variable structure.

diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index b4fa53ddb276e0244257a6219c0cdfdc30701dd3..8b68cd474f32ef4419be11bfe2e6592027cc4191 100644 (file)
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -18,10 +18,11 @@
  */
 
 #include "php.h"
+#include "php_ini.h"
+#include "php_config.h"
 
 #if HAVE_ICONV
 
-#include "php_ini.h"
 #include "php_iconv.h"
 #include "ext/standard/info.h"
 
@@ -76,10 +77,17 @@ PHP_INI_BEGIN()
         STD_PHP_INI_ENTRY("iconv.internal_encoding",           ICONV_INTERNAL_ENCODING,                PHP_INI_ALL,            OnUpdateString,  internal_encoding,             zend_iconv_globals,  iconv_globals)
 PHP_INI_END()
 
+static void
+php_iconv_init_globals(zend_iconv_globals *iconv_globals)
+{
+       iconv_globals->input_encoding = NULL;
+       iconv_globals->output_encoding = NULL;
+       iconv_globals->internal_encoding = NULL;
+}
 
 PHP_MINIT_FUNCTION(iconv)
 {
-       ZEND_INIT_MODULE_GLOBALS(iconv, NULL, NULL);
+       ZEND_INIT_MODULE_GLOBALS(iconv, php_iconv_init_globals, NULL);
        REGISTER_INI_ENTRIES();
        return SUCCESS;
 }

diff --git a/ext/pdf/pdf.c b/ext/pdf/pdf.c
index 71c1a582cdb4232af3183bb250df377c7c416501..5c03507f9a63e482dd4db51c9c5b19615bcc8a65 100644 (file)
--- a/ext/pdf/pdf.c
+++ b/ext/pdf/pdf.c
@@ -27,6 +27,7 @@
 #include "php.h"
 #include "php_ini.h"
 #include "php_globals.h"
+#include "php_config.h"
 #include "ext/standard/head.h"
 #include "ext/standard/info.h"
 #include "ext/standard/file.h"