From a7690fea7af57855fd0e05d9623d0a4467329003 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sat, 13 Sep 2014 20:42:46 +0200 Subject: [PATCH] check if the winver was indeed fetched --- ext/standard/info.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ext/standard/info.c b/ext/standard/info.c index a1a44cbae6..67944b350e 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)); -- 2.50.1