com php-src: avoid usage of 'type' before the null pointer check: TSRM/tsrm_win32.c
| From: | Anatol Belski | Date: | Fri, 29 Aug 2014 09:21:07 +0000 |
| Subject: | com php-src: avoid usage of 'type' before the null pointer check: TSRM/tsrm_win32.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81295@lists.php.net to get a copy of this message | ||
Commit: 34f536693cc4696285f491e79ed14a6cee303b8f
Author: Anatol Belski <ab@php.net> Fri, 29 Aug 2014 11:21:07 +0200
Parents: e206409a8c383b10b250b39f0461e3ad29398014
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=34f536693cc4696285f491e79ed14a6cee303b8f
Log:
avoid usage of 'type' before the null pointer check
Changed paths:
M TSRM/tsrm_win32.c
Diff:
diff --git a/TSRM/tsrm_win32.c b/TSRM/tsrm_win32.c
index a116aaf..0b8228a 100644
--- a/TSRM/tsrm_win32.c
+++ b/TSRM/tsrm_win32.c
@@ -457,7 +457,7 @@ TSRM_API FILE *popen(const char *command, const char *type)
TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env
TSRMLS_DC)
{
FILE *stream = NULL;
- int fno, type_len = strlen(type), read, mode;
+ int fno, type_len, read, mode;
STARTUPINFO startup;
PROCESS_INFORMATION process;
SECURITY_ATTRIBUTES security;