- Fixed bug #51237 (milter SAPI crash on startup)

  patch by: igmar at palsenberg dot com

diff --git a/sapi/milter/php_milter.c b/sapi/milter/php_milter.c
index b40406e4a3acd5db76f2695a5c4d6a4ad6bcfd2f..0c5631d509338f88223b6d09acc35654bf201ddd 100644 (file)
--- a/sapi/milter/php_milter.c
+++ b/sapi/milter/php_milter.c
@@ -92,7 +92,7 @@ extern char *ap_php_optarg;
 extern int ap_php_optind;
 
 static int flag_debug=0;
-static char *filename;
+static char *filename = NULL;
 
 /* per thread */
 ZEND_BEGIN_MODULE_GLOBALS(milter)
@@ -127,6 +127,11 @@ static int mlfi_init()
        /* disable headers */
        SG(headers_sent) = 1;
        SG(request_info).no_headers = 1;
+        
+       if (filename == NULL) {
+               php_printf("No input file specified");
+               return SMFIS_TEMPFAIL;
+       }
 
        if (!(file_handle.handle.fp = VCWD_FOPEN(filename, "rb"))) {
                php_printf("Could not open input file: %s\n", filename);
@@ -189,6 +194,11 @@ static sfsistat    mlfi_connect(SMFICTX *ctx, char *hostname, _SOCK_ADDR *hostaddr)
        SG(headers_sent) = 1;
        SG(request_info).no_headers = 1;
        
+       if (filename == NULL) {
+               php_printf("No input file specified");
+               return SMFIS_TEMPFAIL;
+       }
+       
        if (!(file_handle.handle.fp = VCWD_FOPEN(filename, "rb"))) {
                php_printf("Could not open input file: %s\n", filename);
                return SMFIS_TEMPFAIL;