Fix int/size_t confusion in isValidPharFilename (bug #73580)

smalyshev · smalyshev · commit fe994fd9a471 · 2016-11-25T18:57:18.000-08:00
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
@@ -1062,6 +1062,10 @@ PHP_METHOD(Phar, isValidPharFilename)
 		return;
 	}
 
+	if (ZEND_SIZE_T_INT_OVFL(fname_len)) {
+		RETURN_FALSE;
+	}
+
 	is_executable = executable;
 	RETVAL_BOOL(phar_detect_phar_fname_ext(fname, fname_len, &ext_str, &ext_len, is_executable, 2, 1) == SUCCESS);
 }

Original file line number	Diff line number	Diff line change
`@@ -1062,6 +1062,10 @@ PHP_METHOD(Phar, isValidPharFilename)`
`1062`	`1062`	`return;`
`1063`	`1063`	`}`
`1064`	`1064`
	`1065`	`+ if (ZEND_SIZE_T_INT_OVFL(fname_len)) {`
	`1066`	`+ RETURN_FALSE;`
	`1067`	`+ }`
	`1068`	`+`
`1065`	`1069`	`is_executable = executable;`
`1066`	`1070`	`RETVAL_BOOL(phar_detect_phar_fname_ext(fname, fname_len, &ext_str, &ext_len, is_executable, 2, 1) == SUCCESS);`
`1067`	`1071`	`}`