cvs: php4 /ext/standard quot_print.c

stas Sun Sep 3 02:31:25 2000 EDT Modified files: /php4/ext/standard quot_print.c Log: Fix quoted_printable_decode (also should fix #6511) Index: php4/ext/standard/quot_print.c diff -u php4/ext/standard/quot_print.c:1.9 php4/ext/standard/quot_print.c:1.10 --- php4/ext/standard/quot_print.c:1.9 Mon Jun 5 12:47:44 2000 +++ php4/ext/standard/quot_print.c Sun Sep 3 02:31:25 2000 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: quot_print.c,v 1.9 2000/06/05 19:47:44 andi Exp $ */ +/* $Id: quot_print.c,v 1.10 2000/09/03 09:31:25 stas Exp $ */ #include <stdlib.h> @@ -60,7 +60,7 @@ PHP_FUNCTION(quoted_printable_decode) { pval **arg1; - char *str; + char *str_in, *str_out; int i = 0, j = 0; if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1,&arg1)==FAILURE) @@ -69,30 +69,36 @@ } convert_to_string_ex(arg1); - str = (*arg1)->value.str.val; - while ( str[i] ) + if((*arg1)->value.str.len == 0) { + /* shortcut */ + RETURN_EMPTY_STRING(); + } + + str_in = (*arg1)->value.str.val; + str_out = emalloc((*arg1)->value.str.len+1); + while ( str_in[i] ) { - if ( (str[i] == '=') && str[i+1] && str[i+2] && - ( isdigit((int)str[i+1]) || (str[i+1]<='F' && str[i+1]>='A')) + if ( (str_in[i] == '=') && str_in[i+1] && str_in[i+2] && + ( isdigit((int)str_in[i+1]) || (str_in[i+1]<='F' && str_in[i+1]>='A')) && - ( isdigit((int)str[i+2]) || (str[i+2]<='F' && str[i+2]>='A')) + ( isdigit((int)str_in[i+2]) || (str_in[i+2]<='F' && str_in[i+2]>='A')) ) { - str[j++] = (php_hex2int((int)str[i+1]) << 4 ) - + php_hex2int((int)str[i+2]); + str_out[j++] = (php_hex2int((int)str_in[i+1]) << 4 ) + + php_hex2int((int)str_in[i+2]); i += 3; } - else if ( str[i] == 13 ) + else if ( str_in[i] == 13 ) { i++; } else { - str[j++] = str[i++]; + str_out[j++] = str_in[i++]; } } - str[j] = '\0'; + str_out[j] = '\0'; - RETVAL_STRINGL(str, j, 1) + RETVAL_STRINGL(str_out, j, 0); } /* }}} */