From: Anatol Belski <ab@php.net>
Date: Fri, 12 Sep 2014 22:03:42 +0000 (+0200)
Subject: fix condition
X-Git-Tag: PRE_NATIVE_TLS_MERGE~150^2~18^2~30
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=993d4751260b1e1fbc62dcaeea98fc4988e925b6;p=php

fix condition

A char array like val[1] would always be valid when checking like
!val. Probably better were to check for ->len, but actually ->val[0]
is fine as the actual zend_string should have been initalized
before.
---

diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index c045676b4e..657d1d04de 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -1193,7 +1193,7 @@ static zend_always_inline int _z_param_string(zval *arg, char **dest, size_t *de
 static zend_always_inline int _z_param_path_str(zval *arg, zend_string **dest, int check_null TSRMLS_DC)
 {
 	if (!_z_param_str(arg, dest, check_null TSRMLS_CC) ||
-		(check_null && UNEXPECTED(!(*dest)->val)) ||
+		(check_null && UNEXPECTED(!(*dest)->val[0])) ||
 	    UNEXPECTED(CHECK_NULL_PATH((*dest)->val, (*dest)->len))) {
 		return 0;
 	}