diff options
| author | Felipe Pena <felipe@php.net> | 2010-03-08 23:29:46 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2010-03-08 23:29:46 +0000 |
| commit | 124a9523283b2f4cf6a5dea42a97719866641cca (patch) | |
| tree | 804fd9ddb35e2f640df1e39667d94361ab6090d3 | |
| parent | b2230b0bf5030f53fdffdfbcb3ce050909d836c1 (diff) | |
| download | php-git-124a9523283b2f4cf6a5dea42a97719866641cca.tar.gz | |
- Fixed bug #51237 (milter SAPI crash on startup)
patch by: igmar at palsenberg dot com
| -rw-r--r-- | sapi/milter/php_milter.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sapi/milter/php_milter.c b/sapi/milter/php_milter.c index b40406e4a3..0c5631d509 100644 --- 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; |