Better test coverage

Author: ircmaxell

Zend/zend_API.c

@@ -710,6 +710,9 @@ static int zend_parse_arg(int arg_num, zval **arg, va_list *va, const char **spe
 			const char *space;
 			const char *class_name = get_active_class_name(&space TSRMLS_CC);
 
+			if (0 == strcmp(expected_type, "unknown")) {
+				severity = E_ERROR;
+			}
 			if (error) {
 				zend_error(severity, "%s%s%s() expects parameter %d %s",
 						class_name, space, get_active_function_name(TSRMLS_C), arg_num, error);

Zend/zend_exceptions.c

@@ -86,7 +86,7 @@ void zend_throw_exception_internal(zval *exception TSRMLS_DC) /* {{{ */
 #ifdef HAVE_DTRACE
 	if (DTRACE_EXCEPTION_THROWN_ENABLED()) {
 		char *classname;
-		int name_len;
+		zend_str_size name_len;
 
 		if (exception != NULL) {
 			zend_get_object_classname(exception, &classname, &name_len TSRMLS_CC);
@@ -196,9 +196,10 @@ ZEND_METHOD(exception, __construct)
 	char  *message = NULL;
 	long   code = 0;
 	zval  *object, *previous = NULL;
-	int    argc = ZEND_NUM_ARGS(), message_len;
+	int    argc = ZEND_NUM_ARGS();
+	zend_str_size message_len;
 
-	if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, argc TSRMLS_CC, "|slO!", &message, &message_len, &code, &previous, default_exception_ce) == FAILURE) {
+	if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, argc TSRMLS_CC, "|SlO!", &message, &message_len, &code, &previous, default_exception_ce) == FAILURE) {
 		zend_error(E_ERROR, "Wrong parameters for Exception([string $exception [, long $code [, Exception $previous = NULL]]])");
 	}
 
@@ -225,9 +226,10 @@ ZEND_METHOD(error_exception, __construct)
 	char  *message = NULL, *filename = NULL;
 	long   code = 0, severity = E_ERROR, lineno;
 	zval  *object, *previous = NULL;
-	int    argc = ZEND_NUM_ARGS(), message_len, filename_len;
+	int    argc = ZEND_NUM_ARGS();
+	zend_str_size message_len, filename_len;
 
-	if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, argc TSRMLS_CC, "|sllslO!", &message, &message_len, &code, &severity, &filename, &filename_len, &lineno, &previous, default_exception_ce) == FAILURE) {
+	if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, argc TSRMLS_CC, "|SllSlO!", &message, &message_len, &code, &severity, &filename, &filename_len, &lineno, &previous, default_exception_ce) == FAILURE) {
 		zend_error(E_ERROR, "Wrong parameters for ErrorException([string $exception [, long $code, [ long $severity, [ string $filename, [ long $lineno  [, Exception $previous = NULL]]]]]])");
 	}
 
@@ -262,7 +264,7 @@ ZEND_METHOD(error_exception, __construct)
 		return; \
 	}
 
-static void _default_exception_get_entry(zval *object, char *name, int name_len, zval *return_value TSRMLS_DC) /* {{{ */
+static void _default_exception_get_entry(zval *object, char *name, zend_str_size_int name_len, zval *return_value TSRMLS_DC) /* {{{ */
 {
 	zval *value;
 
@@ -341,7 +343,7 @@ ZEND_METHOD(error_exception, getSeverity)
 
 #define TRACE_APPEND_STRL(val, vallen)                                   \
 	{                                                                    \
-		int l = vallen;                                                  \
+		zend_str_size l = vallen;                                                  \
 		*str = (char*)erealloc(*str, *len + l + 1);                      \
 		memcpy((*str) + *len, val, l);                                   \
 		*len += l;                                                       \
@@ -365,10 +367,10 @@ ZEND_METHOD(error_exception, getSeverity)
 static int _build_trace_args(zval **arg TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) /* {{{ */
 {
 	char **str;
-	int *len;
+	zend_str_size *len;
 
 	str = va_arg(args, char**);
-	len = va_arg(args, int*);
+	len = va_arg(args, zend_str_size*);
 
 	/* the trivial way would be to do:
 	 * conver_to_string_ex(arg);
@@ -381,7 +383,7 @@ static int _build_trace_args(zval **arg TSRMLS_DC, int num_args, va_list args, z
 			TRACE_APPEND_STR("NULL, ");
 			break;
 		case IS_STRING: {
-			int l_added;
+			zend_str_size l_added;
 			TRACE_APPEND_CHR('\'');
 			if (Z_STRSIZE_PP(arg) > 15) {
 				TRACE_APPEND_STRL(Z_STRVAL_PP(arg), 15);
@@ -413,15 +415,15 @@ static int _build_trace_args(zval **arg TSRMLS_DC, int num_args, va_list args, z
 		case IS_LONG: {
 			long lval = Z_LVAL_PP(arg);
 			char s_tmp[MAX_LENGTH_OF_LONG + 1];
-			int l_tmp = zend_sprintf(s_tmp, "%ld", lval);  /* SAFE */
+			zend_str_size l_tmp = zend_sprintf(s_tmp, "%ld", lval);  /* SAFE */
 			TRACE_APPEND_STRL(s_tmp, l_tmp);
 			TRACE_APPEND_STR(", ");
 			break;
 		}
 		case IS_DOUBLE: {
 			double dval = Z_DVAL_PP(arg);
 			char *s_tmp;
-			int l_tmp;
+			zend_str_size l_tmp;
 
 			s_tmp = emalloc(MAX_LENGTH_OF_DOUBLE + EG(precision) + 1);
 			l_tmp = zend_sprintf(s_tmp, "%.*G", (int) EG(precision), dval);  /* SAFE */
@@ -436,7 +438,7 @@ static int _build_trace_args(zval **arg TSRMLS_DC, int num_args, va_list args, z
 			break;
 		case IS_OBJECT: {
 			const char *class_name;
-			zend_uint class_name_len;
+			zend_str_size class_name_len;
 			int dup;
 
 			TRACE_APPEND_STR("Object(");
@@ -461,7 +463,7 @@ static int _build_trace_args(zval **arg TSRMLS_DC, int num_args, va_list args, z
 static int _build_trace_string(zval **frame TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) /* {{{ */
 {
 	char *s_tmp, **str;
-	int *len, *num;
+	zend_str_size *len, *num;
 	long line;
 	HashTable *ht = Z_ARRVAL_PP(frame);
 	zval **file, **tmp;
@@ -472,8 +474,8 @@ static int _build_trace_string(zval **frame TSRMLS_DC, int num_args, va_list arg
 	}
 
 	str = va_arg(args, char**);
-	len = va_arg(args, int*);
-	num = va_arg(args, int*);
+	len = va_arg(args, zend_str_size*);
+	num = va_arg(args, zend_str_size*);
 
 	s_tmp = emalloc(1 + MAX_LENGTH_OF_LONG + 1 + 1);
 	sprintf(s_tmp, "#%d ", (*num)++);
@@ -528,7 +530,7 @@ ZEND_METHOD(exception, getTraceAsString)
 {
 	zval *trace;
 	char *res, **str, *s_tmp;
-	int res_len = 0, *len = &res_len, num = 0;
+	zend_str_size res_len = 0, *len = &res_len, num = 0;
 
 	DEFAULT_0_PARAMS;
 
@@ -560,10 +562,10 @@ ZEND_METHOD(exception, getPrevious)
 	RETURN_ZVAL(previous, 1, 0);
 }
 
-int zend_spprintf(char **message, int max_len, char *format, ...) /* {{{ */
+zend_str_size_int zend_spprintf(char **message, zend_str_size_int max_len, char *format, ...) /* {{{ */
 {
 	va_list arg;
-	int len;
+	zend_str_size len;
 
 	va_start(arg, format);
 	len = zend_vspprintf(message, max_len, format, arg);
@@ -578,7 +580,7 @@ ZEND_METHOD(exception, __toString)
 {
 	zval message, file, line, *trace, *exception;
 	char *str, *prev_str;
-	int len = 0;
+	zend_str_size len = 0;
 	zend_fcall_info fci;
 	zval fname;
 
@@ -783,7 +785,7 @@ ZEND_API zval * zend_throw_error_exception(zend_class_entry *exception_ce, char
 }
 /* }}} */
 
-static void zend_error_va(int type, const char *file, uint lineno, const char *format, ...) /* {{{ */
+static void zend_error_va(int type, const char *file, zend_str_size_uint lineno, const char *format, ...) /* {{{ */
 {
 	va_list args;
 

Zend/zend_exceptions.h

@@ -53,7 +53,7 @@ extern ZEND_API void (*zend_throw_exception_hook)(zval *ex TSRMLS_DC);
 ZEND_API void zend_exception_error(zval *exception, int severity TSRMLS_DC);
 
 /* do not export, in php it's available thru spprintf directly */
-int zend_spprintf(char **message, int max_len, char *format, ...);
+zend_str_size_int zend_spprintf(char **message, zend_str_size_int max_len, char *format, ...);
 
 END_EXTERN_C()