Skip to content

Commit 49b87c0

Browse files
kocsismatekocsismate
committed
Promote warnings to exceptions in *scanf() functions
1 parent bc6bb44 commit 49b87c0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+889
-1851
lines changed

‎ext/standard/scanf.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -469,11 +469,11 @@ PHPAPI int ValidateFormat(char *format, int numVars, int *totalSubs)
469469
}
470470
break;
471471
badSet:
472-
php_error_docref(NULL, E_WARNING, "Unmatched [ in format string");
472+
zend_value_error("Unmatched [ in format string");
473473
goto error;
474474

475475
default: {
476-
php_error_docref(NULL, E_WARNING, "Bad scan conversion character \"%c\"", *ch);
476+
zend_value_error("Bad scan conversion character \"%c\"", *ch);
477477
goto error;
478478
}
479479
}
@@ -618,7 +618,7 @@ PHPAPI int php_sscanf_internal( char *string, char *format,
618618
if (numVars) {
619619
for (i = varStart;i < argCount;i++){
620620
if ( ! Z_ISREF(args[ i ] ) ) {
621-
php_error_docref(NULL, E_WARNING, "Parameter %d must be passed by reference", i);
621+
zend_value_error("Parameter %d must be passed by reference", i);
622622
scan_set_error_return(numVars, return_value);
623623
return SCAN_ERROR_VAR_PASSED_BYVAL;
624624
}

‎ext/standard/tests/file/fscanf.phpt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@ fclose($fp);
3434
$v = array();
3535
$v1 = array();
3636
$fp = fopen($filename, "rt");
37-
var_dump(fscanf($fp, "%.a", $v, $v1));
37+
try {
38+
fscanf($fp, "%.a", $v, $v1);
39+
} catch (ValueError $exception) {
40+
echo $exception->getMessage() . "\n";
41+
}
3842
var_dump($v);
3943
var_dump($v1);
4044
fclose($fp);
@@ -76,9 +80,7 @@ array(0) {
7680
}
7781
array(0) {
7882
}
79-
80-
Warning: fscanf(): Bad scan conversion character "." in %s on line %d
81-
int(-1)
83+
Bad scan conversion character "."
8284
array(0) {
8385
}
8486
array(0) {

‎ext/standard/tests/file/fscanf_error.phpt

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,11 @@ foreach($invalid_formats as $format) {
4242
$file_handle = fopen($filename, 'r');
4343
if ($file_handle == false)
4444
exit("Error:failed to open file $filename");
45-
var_dump( fscanf($file_handle, $format) );
45+
try {
46+
var_dump( fscanf($file_handle, $format) );
47+
} catch (ValueError $exception) {
48+
echo $exception->getMessage() . "\n";
49+
}
4650
fclose($file_handle);
4751
}
4852

@@ -64,17 +68,9 @@ int(-1)
6468
Warning: Undefined variable: undefined_var in %s on line %d
6569
array(0) {
6670
}
67-
68-
Warning: fscanf(): Bad scan conversion character " in %s on line %d
69-
NULL
70-
71-
Warning: fscanf(): Bad scan conversion character " in %s on line %d
72-
NULL
73-
74-
Warning: fscanf(): Bad scan conversion character "." in %s on line %d
75-
NULL
76-
77-
Warning: fscanf(): Bad scan conversion character "m" in %s on line %d
78-
NULL
71+
Bad scan conversion character "
72+
Bad scan conversion character "
73+
Bad scan conversion character "."
74+
Bad scan conversion character "m"
7975

8076
*** Done ***

‎ext/standard/tests/file/fscanf_variation10.phpt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,11 @@ foreach($float_formats as $float_format) {
6161
rewind($file_handle);
6262
echo "\n-- iteration $counter --\n";
6363
while( !feof($file_handle) ) {
64-
var_dump( fscanf($file_handle,$float_format) );
64+
try {
65+
var_dump( fscanf($file_handle,$float_format) );
66+
} catch (ValueError $exception) {
67+
echo $exception->getMessage() . "\n";
68+
}
6569
}
6670
$counter++;
6771
}
@@ -148,12 +152,8 @@ array(1) {
148152
bool(false)
149153

150154
-- iteration 7 --
151-
152-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
153-
NULL
154-
155-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
156-
NULL
155+
Bad scan conversion character " "
156+
Bad scan conversion character " "
157157
bool(false)
158158

159159
-- iteration 8 --

‎ext/standard/tests/file/fscanf_variation11.phpt

Lines changed: 18 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,11 @@ foreach($float_formats as $float_format) {
6666
rewind($file_handle);
6767
echo "\n-- iteration $counter --\n";
6868
while( !feof($file_handle) ) {
69-
var_dump( fscanf($file_handle,$float_format) );
69+
try {
70+
var_dump(fscanf($file_handle,$float_format));
71+
} catch (ValueError $exception) {
72+
echo $exception->getMessage() . "\n";
73+
}
7074
}
7175
$counter++;
7276
}
@@ -79,7 +83,7 @@ $file_path = __DIR__;
7983
$filename = "$file_path/fscanf_variation11.tmp";
8084
unlink($filename);
8185
?>
82-
--EXPECTF--
86+
--EXPECT--
8387
*** Test fscanf(): different float format types with arrays ***
8488

8589
-- iteration 1 --
@@ -389,42 +393,18 @@ array(1) {
389393
bool(false)
390394

391395
-- iteration 7 --
392-
393-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
394-
NULL
395-
396-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
397-
NULL
398-
399-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
400-
NULL
401-
402-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
403-
NULL
404-
405-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
406-
NULL
407-
408-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
409-
NULL
410-
411-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
412-
NULL
413-
414-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
415-
NULL
416-
417-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
418-
NULL
419-
420-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
421-
NULL
422-
423-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
424-
NULL
425-
426-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
427-
NULL
396+
Bad scan conversion character " "
397+
Bad scan conversion character " "
398+
Bad scan conversion character " "
399+
Bad scan conversion character " "
400+
Bad scan conversion character " "
401+
Bad scan conversion character " "
402+
Bad scan conversion character " "
403+
Bad scan conversion character " "
404+
Bad scan conversion character " "
405+
Bad scan conversion character " "
406+
Bad scan conversion character " "
407+
Bad scan conversion character " "
428408
bool(false)
429409

430410
-- iteration 8 --

‎ext/standard/tests/file/fscanf_variation12.phpt

Lines changed: 24 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,11 @@ foreach($float_formats as $float_format) {
6767
rewind($file_handle);
6868
echo "\n-- iteration $counter --\n";
6969
while( !feof($file_handle) ) {
70-
var_dump( fscanf($file_handle,$float_format) );
70+
try {
71+
var_dump(fscanf($file_handle,$float_format));
72+
} catch (ValueError $exception) {
73+
echo $exception->getMessage() . "\n";
74+
}
7175
}
7276
$counter++;
7377
}
@@ -80,7 +84,7 @@ $file_path = __DIR__;
8084
$filename = "$file_path/fscanf_variation12.tmp";
8185
unlink($filename);
8286
?>
83-
--EXPECTF--
87+
--EXPECT--
8488
*** Test fscanf(): different float format types with strings ***
8589

8690
-- iteration 1 --
@@ -498,60 +502,24 @@ array(1) {
498502
bool(false)
499503

500504
-- iteration 7 --
501-
502-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
503-
NULL
504-
505-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
506-
NULL
507-
508-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
509-
NULL
510-
511-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
512-
NULL
513-
514-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
515-
NULL
516-
517-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
518-
NULL
519-
520-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
521-
NULL
522-
523-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
524-
NULL
525-
526-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
527-
NULL
528-
529-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
530-
NULL
531-
532-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
533-
NULL
534-
535-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
536-
NULL
537-
538-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
539-
NULL
540-
541-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
542-
NULL
543-
544-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
545-
NULL
546-
547-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
548-
NULL
549-
550-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
551-
NULL
552-
553-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
554-
NULL
505+
Bad scan conversion character " "
506+
Bad scan conversion character " "
507+
Bad scan conversion character " "
508+
Bad scan conversion character " "
509+
Bad scan conversion character " "
510+
Bad scan conversion character " "
511+
Bad scan conversion character " "
512+
Bad scan conversion character " "
513+
Bad scan conversion character " "
514+
Bad scan conversion character " "
515+
Bad scan conversion character " "
516+
Bad scan conversion character " "
517+
Bad scan conversion character " "
518+
Bad scan conversion character " "
519+
Bad scan conversion character " "
520+
Bad scan conversion character " "
521+
Bad scan conversion character " "
522+
Bad scan conversion character " "
555523
bool(false)
556524

557525
-- iteration 8 --

‎ext/standard/tests/file/fscanf_variation13.phpt

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,11 @@ foreach($float_formats as $float_format) {
5353
rewind($file_handle);
5454
echo "\n-- iteration $counter --\n";
5555
while( !feof($file_handle) ) {
56-
var_dump( fscanf($file_handle,$float_format) );
56+
try {
57+
var_dump(fscanf($file_handle,$float_format));
58+
} catch (ValueError $exception) {
59+
echo $exception->getMessage() . "\n";
60+
}
5761
}
5862
$counter++;
5963
}
@@ -66,7 +70,7 @@ $file_path = __DIR__;
6670
$filename = "$file_path/fscanf_variation13.tmp";
6771
unlink($filename);
6872
?>
69-
--EXPECTF--
73+
--EXPECT--
7074
*** Test fscanf(): different float format types with boolean data ***
7175

7276
-- iteration 1 --
@@ -148,18 +152,10 @@ NULL
148152
bool(false)
149153

150154
-- iteration 7 --
151-
152-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
153-
NULL
154-
155-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
156-
NULL
157-
158-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
159-
NULL
160-
161-
Warning: fscanf(): Bad scan conversion character " " in %s on line %d
162-
NULL
155+
Bad scan conversion character " "
156+
Bad scan conversion character " "
157+
Bad scan conversion character " "
158+
Bad scan conversion character " "
163159
bool(false)
164160

165161
-- iteration 8 --

0 commit comments

Comments
 (0)