Fixed Issue laruence#97

gracefully · May 15, 2014 · e94ad22 · e94ad22
1 parent 1097e40
commit e94ad22
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 6 deletions.
diff --git a/configs/yaf_config_ini.c b/configs/yaf_config_ini.c
@@ -699,6 +699,9 @@ PHP_METHOD(yaf_config_ini, get) {
 	} else {
 		zval *properties;
 		char *entry, *seg, *pptr;
+		int seg_len;
+	   	long lval;
+		double dval;
 
 		properties = zend_read_property(yaf_config_ini_ce, getThis(), ZEND_STRL(YAF_CONFIG_PROPERT_NAME), 1 TSRMLS_CC);
 
@@ -709,19 +712,32 @@ PHP_METHOD(yaf_config_ini, get) {
 		entry = estrndup(name, len);
 		if ((seg = php_strtok_r(entry, ".", &pptr))) {
 			while (seg) {
-				if (zend_hash_find(Z_ARRVAL_P(properties), seg, strlen(seg) + 1, (void **) &ppzval) == FAILURE) {
-					efree(entry);
-					RETURN_NULL();
+				seg_len = strlen(seg);
+				if (is_numeric_string(seg, seg_len, &lval, &dval, 0) != IS_LONG) {
+					if (zend_hash_find(Z_ARRVAL_P(properties), seg, seg_len + 1, (void **) &ppzval) == FAILURE) {
+						efree(entry);
+						RETURN_NULL();
+					}
+				} else {
+					if (zend_hash_index_find(Z_ARRVAL_P(properties), lval, (void **) &ppzval) == FAILURE) {
+						efree(entry);
+						RETURN_NULL();
+					}
 				}
 
 				properties = *ppzval;
 				seg = php_strtok_r(NULL, ".", &pptr);
 			}
-		} else {
+		} else if (is_numeric_string(name, len, &lval, &dval, 0) != IS_LONG) {
 			if (zend_hash_find(Z_ARRVAL_P(properties), name, len + 1, (void **)&ppzval) == FAILURE) {
 				efree(entry);
 				RETURN_NULL();
 			}
+		} else {
+			if (zend_hash_index_find(Z_ARRVAL_P(properties), lval, (void **) &ppzval) == FAILURE) {
+				efree(entry);
+				RETURN_NULL();
+			}
 		}
 
 		efree(entry);

diff --git a/configs/yaf_config_simple.c b/configs/yaf_config_simple.c
@@ -141,12 +141,20 @@ PHP_METHOD(yaf_config_simple, get) {
 	} else {
 		zval *properties;
 		HashTable *hash;
+		long lval;
+		double dval;
 
 		properties = zend_read_property(yaf_config_simple_ce, getThis(), ZEND_STRL(YAF_CONFIG_PROPERT_NAME), 1 TSRMLS_CC);
 		hash  = Z_ARRVAL_P(properties);
 
-		if (zend_hash_find(hash, name, len + 1, (void **) &ppzval) == FAILURE) {
-			RETURN_FALSE;
+		if (is_numeric_string(name, len, &lval, &dval, 0) != IS_LONG) {
+			if (zend_hash_find(hash, name, len + 1, (void **) &ppzval) == FAILURE) {
+				RETURN_FALSE;
+			} 
+		} else {
+			if (zend_hash_index_find(hash, lval, (void **) &ppzval) == FAILURE) {
+				RETURN_FALSE;
+			} 
 		}
 
 		if (Z_TYPE_PP(ppzval) == IS_ARRAY) {