Validate string is numeric for integer PDO attribute value

Author: Girgias

ext/pdo/pdo_dbh.c

@@ -678,11 +678,20 @@ PHP_METHOD(PDO, inTransaction)
 }
 /* }}} */
 
-/* TODO: Make distinction between numeric and non-numeric strings */
-#define PDO_LONG_PARAM_CHECK \
-	if (Z_TYPE_P(value) != IS_LONG && Z_TYPE_P(value) != IS_STRING && Z_TYPE_P(value) != IS_FALSE && Z_TYPE_P(value) != IS_TRUE) { \
-		zend_type_error("Attribute value must be of type int for selected attribute, %s given", zend_zval_type_name(value)); \
-		return false; \
+#define PDO_GET_LONG_PARAM(zval) \
+	switch (Z_TYPE_P(zval)) { \
+		case IS_LONG: \
+		case IS_TRUE: \
+		case IS_FALSE: \
+			lval = zval_get_long(zval); \
+			break; \
+		case IS_STRING: \
+			if (IS_LONG == is_numeric_str_function(Z_STR_P(zval), &lval, NULL)) { \
+				break; \
+			} \
+			/* fallthrough */ \
+		default: \
+			zend_type_error("Attribute value must be of type int for selected attribute, %s given", zend_zval_type_name(zval)); \
 	} \
 
 /* Return false on failure, true otherwise */
@@ -692,8 +701,7 @@ static bool pdo_dbh_attribute_set(pdo_dbh_t *dbh, zend_long attr, zval *value) /
 
 	switch (attr) {
 		case PDO_ATTR_ERRMODE:
-			PDO_LONG_PARAM_CHECK;
-			lval = zval_get_long(value);
+			PDO_GET_LONG_PARAM(value);
 			switch (lval) {
 				case PDO_ERRMODE_SILENT:
 				case PDO_ERRMODE_WARNING:
@@ -707,8 +715,7 @@ static bool pdo_dbh_attribute_set(pdo_dbh_t *dbh, zend_long attr, zval *value) /
 			return false;
 
 		case PDO_ATTR_CASE:
-			PDO_LONG_PARAM_CHECK;
-			lval = zval_get_long(value);
+			PDO_GET_LONG_PARAM(value);
 			switch (lval) {
 				case PDO_CASE_NATURAL:
 				case PDO_CASE_UPPER:
@@ -722,8 +729,8 @@ static bool pdo_dbh_attribute_set(pdo_dbh_t *dbh, zend_long attr, zval *value) /
 			return false;
 
 		case PDO_ATTR_ORACLE_NULLS:
-			PDO_LONG_PARAM_CHECK;
-			dbh->oracle_nulls = zval_get_long(value);
+			PDO_GET_LONG_PARAM(value);
+			dbh->oracle_nulls = lval;
 			return true;
 
 		case PDO_ATTR_DEFAULT_FETCH_MODE:
@@ -735,10 +742,10 @@ static bool pdo_dbh_attribute_set(pdo_dbh_t *dbh, zend_long attr, zval *value) /
 						return false;
 					}
 				}
+				lval = zval_get_long(value);
 			} else {
-				PDO_LONG_PARAM_CHECK;
+				PDO_GET_LONG_PARAM(value);
 			}
-			lval = zval_get_long(value);
 			if (lval == PDO_FETCH_USE_DEFAULT) {
 				zend_value_error("Fetch mode must be a bitmask of PDO::FETCH_* constants");
 				return false;
@@ -747,8 +754,8 @@ static bool pdo_dbh_attribute_set(pdo_dbh_t *dbh, zend_long attr, zval *value) /
 			return true;
 
 		case PDO_ATTR_STRINGIFY_FETCHES:
-			PDO_LONG_PARAM_CHECK;
-			dbh->stringify = zval_get_long(value) ? 1 : 0;
+			PDO_GET_LONG_PARAM(value);
+			dbh->stringify = lval ? 1 : 0;
 			return true;
 
 		case PDO_ATTR_STATEMENT_CLASS: {

ext/pdo/tests/bug_44159.phpt

@@ -24,12 +24,12 @@ foreach ($attrs as $attr) {
         echo  get_class($e), ': ', $e->getMessage(), \PHP_EOL;
     }
     try {
-        var_dump($pdo->setAttribute($attr, 1));
+        var_dump($pdo->setAttribute($attr, 'nonsense'));
     } catch (\Error $e) {
         echo  get_class($e), ': ', $e->getMessage(), \PHP_EOL;
     }
     try {
-        var_dump($pdo->setAttribute($attr, 'nonsense'));
+        var_dump($pdo->setAttribute($attr, 1));
     } catch (\Error $e) {
         echo  get_class($e), ': ', $e->getMessage(), \PHP_EOL;
     }
@@ -40,8 +40,8 @@ foreach ($attrs as $attr) {
 ?>
 --EXPECT--
 TypeError: PDO::ATTR_STATEMENT_CLASS value must be of type array, null given
-TypeError: PDO::ATTR_STATEMENT_CLASS value must be of type array, int given
 TypeError: PDO::ATTR_STATEMENT_CLASS value must be of type array, string given
+TypeError: PDO::ATTR_STATEMENT_CLASS value must be of type array, int given
 TypeError: Attribute value must be of type int for selected attribute, null given
-bool(true)
+TypeError: Attribute value must be of type int for selected attribute, string given
 bool(true)