@@ -614,12 +614,7 @@ static const char *zend_ini_consume_quantity_prefix(const char *const digits, co
614614 return digits_consumed ;
615615}
616616
617- static zend_ulong zend_ini_parse_quantity_internal (
618- const zend_string * value ,
619- zend_ini_parse_quantity_signed_result_t signed_result ,
620- zend_string * * errstr ,
621- bool strict
622- ) /* {{{ */
617+ static zend_ulong zend_ini_parse_quantity_internal (const zend_string * value , zend_ini_parse_quantity_signed_result_t signed_result , zend_string * * errstr ) /* {{{ */
623618{
624619 char * digits_end = NULL ;
625620 const char * str = ZSTR_VAL (value );
@@ -639,18 +634,6 @@ static zend_ulong zend_ini_parse_quantity_internal(
639634 while (digits < str_end && zend_is_whitespace (* (str_end - 1 ))) {-- str_end ;}
640635
641636 if (digits == str_end ) {
642- if (strict ) {
643- if (ZSTR_LEN (value ) == 0 ) {
644- * errstr = zend_strpprintf (0 , "Invalid quantity \"\": no valid leading digits" );
645- } else {
646- smart_str_append_escaped (& invalid , ZSTR_VAL (value ), ZSTR_LEN (value ));
647- smart_str_0 (& invalid );
648- * errstr = zend_strpprintf (0 , "Invalid quantity \"%s\": no valid leading digits" ,
649- ZSTR_VAL (invalid .s ));
650- smart_str_free (& invalid );
651- }
652- return 0 ;
653- }
654637 * errstr = NULL ;
655638 return 0 ;
656639 }
@@ -670,13 +653,8 @@ static zend_ulong zend_ini_parse_quantity_internal(
670653 smart_str_append_escaped (& invalid , ZSTR_VAL (value ), ZSTR_LEN (value ));
671654 smart_str_0 (& invalid );
672655
673- if (strict ) {
674- * errstr = zend_strpprintf (0 , "Invalid quantity \"%s\": no valid leading digits" ,
675- ZSTR_VAL (invalid .s ));
676- } else {
677- * errstr = zend_strpprintf (0 , "Invalid quantity \"%s\": no valid leading digits, interpreting as \"0\" for backwards compatibility" ,
678- ZSTR_VAL (invalid .s ));
679- }
656+ * errstr = zend_strpprintf (0 , "Invalid quantity \"%s\": no valid leading digits, interpreting as \"0\" for backwards compatibility" ,
657+ ZSTR_VAL (invalid .s ));
680658
681659 smart_str_free (& invalid );
682660 return 0 ;
@@ -712,12 +690,8 @@ static zend_ulong zend_ini_parse_quantity_internal(
712690 base = 2 ;
713691 break ;
714692 default :
715- if (strict ) {
716- * errstr = zend_strpprintf (0 , "Invalid prefix \"0%c\"" , digits [1 ]);
717- } else {
718- * errstr = zend_strpprintf (0 , "Invalid prefix \"0%c\", interpreting as \"0\" for backwards compatibility" ,
719- digits [1 ]);
720- }
693+ * errstr = zend_strpprintf (0 , "Invalid prefix \"0%c\", interpreting as \"0\" for backwards compatibility" ,
694+ digits [1 ]);
721695 return 0 ;
722696 }
723697 digits += 2 ;
@@ -728,13 +702,8 @@ static zend_ulong zend_ini_parse_quantity_internal(
728702 smart_str_append_escaped (& invalid , ZSTR_VAL (value ), ZSTR_LEN (value ));
729703 smart_str_0 (& invalid );
730704
731- if (strict ) {
732- * errstr = zend_strpprintf (0 , "Invalid quantity \"%s\": no digits after base prefix" ,
733- ZSTR_VAL (invalid .s ));
734- } else {
735- * errstr = zend_strpprintf (0 , "Invalid quantity \"%s\": no digits after base prefix, interpreting as \"0\" for backwards compatibility" ,
736- ZSTR_VAL (invalid .s ));
737- }
705+ * errstr = zend_strpprintf (0 , "Invalid quantity \"%s\": no digits after base prefix, interpreting as \"0\" for backwards compatibility" ,
706+ ZSTR_VAL (invalid .s ));
738707
739708 smart_str_free (& invalid );
740709 return 0 ;
@@ -775,13 +744,8 @@ static zend_ulong zend_ini_parse_quantity_internal(
775744 smart_str_append_escaped (& invalid , ZSTR_VAL (value ), ZSTR_LEN (value ));
776745 smart_str_0 (& invalid );
777746
778- if (strict ) {
779- * errstr = zend_strpprintf (0 , "Invalid quantity \"%s\": no valid leading digits" ,
780- ZSTR_VAL (invalid .s ));
781- } else {
782- * errstr = zend_strpprintf (0 , "Invalid quantity \"%s\": no valid leading digits, interpreting as \"0\" for backwards compatibility" ,
783- ZSTR_VAL (invalid .s ));
784- }
747+ * errstr = zend_strpprintf (0 , "Invalid quantity \"%s\": no valid leading digits, interpreting as \"0\" for backwards compatibility" ,
748+ ZSTR_VAL (invalid .s ));
785749
786750 smart_str_free (& invalid );
787751 return 0 ;
@@ -817,13 +781,8 @@ static zend_ulong zend_ini_parse_quantity_internal(
817781 smart_str_append_escaped (& chr , str_end - 1 , 1 );
818782 smart_str_0 (& chr );
819783
820- if (strict ) {
821- * errstr = zend_strpprintf (0 , "Invalid quantity \"%s\": unknown multiplier \"%s\"" ,
822- ZSTR_VAL (invalid .s ), ZSTR_VAL (chr .s ));
823- } else {
824- * errstr = zend_strpprintf (0 , "Invalid quantity \"%s\": unknown multiplier \"%s\", interpreting as \"%s\" for backwards compatibility" ,
825- ZSTR_VAL (invalid .s ), ZSTR_VAL (chr .s ), ZSTR_VAL (interpreted .s ));
826- }
784+ * errstr = zend_strpprintf (0 , "Invalid quantity \"%s\": unknown multiplier \"%s\", interpreting as \"%s\" for backwards compatibility" ,
785+ ZSTR_VAL (invalid .s ), ZSTR_VAL (chr .s ), ZSTR_VAL (interpreted .s ));
827786
828787 smart_str_free (& invalid );
829788 smart_str_free (& interpreted );
@@ -856,13 +815,8 @@ static zend_ulong zend_ini_parse_quantity_internal(
856815 smart_str_append_escaped (& chr , str_end - 1 , 1 );
857816 smart_str_0 (& chr );
858817
859- if (strict ) {
860- * errstr = zend_strpprintf (0 , "Invalid quantity \"%s\": invalid characters before multiplier \"%s\"" ,
861- ZSTR_VAL (invalid .s ), ZSTR_VAL (chr .s ));
862- } else {
863- * errstr = zend_strpprintf (0 , "Invalid quantity \"%s\", interpreting as \"%s%s\" for backwards compatibility" ,
864- ZSTR_VAL (invalid .s ), ZSTR_VAL (interpreted .s ), ZSTR_VAL (chr .s ));
865- }
818+ * errstr = zend_strpprintf (0 , "Invalid quantity \"%s\", interpreting as \"%s%s\" for backwards compatibility" ,
819+ ZSTR_VAL (invalid .s ), ZSTR_VAL (interpreted .s ), ZSTR_VAL (chr .s ));
866820
867821 smart_str_free (& invalid );
868822 smart_str_free (& interpreted );
@@ -879,13 +833,8 @@ static zend_ulong zend_ini_parse_quantity_internal(
879833 /* Not specifying the resulting value here because the caller may make
880834 * additional conversions. Not specifying the allowed range
881835 * because the caller may do narrower range checks. */
882- if (strict ) {
883- * errstr = zend_strpprintf (0 , "Invalid quantity \"%s\": value is out of range" ,
884- ZSTR_VAL (invalid .s ));
885- } else {
886- * errstr = zend_strpprintf (0 , "Invalid quantity \"%s\": value is out of range, using overflow result for backwards compatibility" ,
887- ZSTR_VAL (invalid .s ));
888- }
836+ * errstr = zend_strpprintf (0 , "Invalid quantity \"%s\": value is out of range, using overflow result for backwards compatibility" ,
837+ ZSTR_VAL (invalid .s ));
889838
890839 smart_str_free (& invalid );
891840 smart_str_free (& interpreted );
@@ -901,25 +850,13 @@ static zend_ulong zend_ini_parse_quantity_internal(
901850
902851ZEND_API zend_long zend_ini_parse_quantity (const zend_string * value , zend_string * * errstr ) /* {{{ */
903852{
904- return (zend_long ) zend_ini_parse_quantity_internal (value , ZEND_INI_PARSE_QUANTITY_SIGNED , errstr , false );
853+ return (zend_long ) zend_ini_parse_quantity_internal (value , ZEND_INI_PARSE_QUANTITY_SIGNED , errstr );
905854}
906855/* }}} */
907856
908857ZEND_API zend_ulong zend_ini_parse_uquantity (const zend_string * value , zend_string * * errstr ) /* {{{ */
909858{
910- return zend_ini_parse_quantity_internal (value , ZEND_INI_PARSE_QUANTITY_UNSIGNED , errstr , false);
911- }
912- /* }}} */
913-
914- ZEND_API zend_result zend_ini_parse_quantity_strict (const zend_string * value , zend_long * result , zend_string * * errstr ) /* {{{ */
915- {
916- zend_long retval = (zend_long ) zend_ini_parse_quantity_internal (value , ZEND_INI_PARSE_QUANTITY_SIGNED , errstr , true);
917- if (* errstr ) {
918- return FAILURE ;
919- }
920-
921- * result = retval ;
922- return SUCCESS ;
859+ return zend_ini_parse_quantity_internal (value , ZEND_INI_PARSE_QUANTITY_UNSIGNED , errstr );
923860}
924861/* }}} */
925862
@@ -1037,23 +974,6 @@ ZEND_API ZEND_INI_MH(OnUpdateLong) /* {{{ */
1037974}
1038975/* }}} */
1039976
1040- ZEND_API ZEND_INI_MH (OnUpdateLongStrict ) /* {{{ */
1041- {
1042- zend_long tmp ;
1043- zend_string * errstr ;
1044- if (UNEXPECTED (zend_ini_parse_quantity_strict (new_value , & tmp , & errstr ) == FAILURE )) {
1045- zend_error (E_WARNING , "Invalid \"%s\" setting. %s" , ZSTR_VAL (entry -> name ), ZSTR_VAL (errstr ));
1046- zend_string_release (errstr );
1047- return FAILURE ;
1048- }
1049-
1050- zend_long * p = ZEND_INI_GET_ADDR ();
1051- * p = tmp ;
1052-
1053- return SUCCESS ;
1054- }
1055- /* }}} */
1056-
1057977ZEND_API ZEND_INI_MH (OnUpdateLongGEZero ) /* {{{ */
1058978{
1059979 zend_long tmp = zend_ini_parse_quantity_warn (new_value , entry -> name );
0 commit comments