com php-src: check if the winver was indeed fetched: ext/standard/info.c
| From: | Anatol Belski | Date: | Sat, 13 Sep 2014 21:21:48 +0000 |
| Subject: | com php-src: check if the winver was indeed fetched: ext/standard/info.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81557@lists.php.net to get a copy of this message | ||
Commit: a7690fea7af57855fd0e05d9623d0a4467329003
Author: Anatol Belski <ab@php.net> Sat, 13 Sep 2014 20:42:46 +0200
Parents: bce562b75efcdacc762a3b94915cdf02056b22dc
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a7690fea7af57855fd0e05d9623d0a4467329003
Log:
check if the winver was indeed fetched
Changed paths:
M ext/standard/info.c
Diff:
diff --git a/ext/standard/info.c b/ext/standard/info.c
index a1a44cb..67944b3 100644
--- a/ext/standard/info.c
+++ b/ext/standard/info.c
@@ -585,6 +585,12 @@ PHPAPI zend_string *php_get_uname(char mode)
char *winver = php_get_windows_name();
char wincpu[20];
+ if (NULL == winver) {
+ TSRMLS_FETCH();
+ /* This should never happen */
+ return STR_EMPTY_ALLOC();
+ }
+
php_get_windows_cpu(wincpu, sizeof(wincpu));
dwBuild = (DWORD)(HIWORD(dwVersion));