com php-src: fix uuencode: ext/standard/php_uuencode.h ex t/standard/uuencode.c

From: Date: Wed, 16 Oct 2013 09:32:18 +0000
Subject: com php-src: fix uuencode: ext/standard/php_uuencode.h ex t/standard/uuencode.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-73510@lists.php.net to get a copy of this message
Commit: 74a68df77c8fcf3b3017bf7b3ccff00c988681f0 Author: Anatol Belski <ab@php.net> Thu, 11 Jul 2013 08:12:30 -0700 Parents: 42fdfacae682562c09e78af2f3e22879fffd54db Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=74a68df77c8fcf3b3017bf7b3ccff00c988681f0 Log: fix uuencode Changed paths: M ext/standard/php_uuencode.h M ext/standard/uuencode.c Diff: diff --git a/ext/standard/php_uuencode.h b/ext/standard/php_uuencode.h index 28bcb09..dfc5795 100644 --- a/ext/standard/php_uuencode.h +++ b/ext/standard/php_uuencode.h @@ -24,8 +24,8 @@ PHP_FUNCTION(convert_uudecode); PHP_FUNCTION(convert_uuencode); -PHPAPI int php_uudecode(char *src, int src_len, char **dest); -PHPAPI int php_uuencode(char *src, int src_len, char **dest); +PHPAPI zend_str_size_int php_uudecode(char *src, zend_str_size_int src_len, char **dest, int *error); +PHPAPI zend_str_size_int php_uuencode(char *src, zend_str_size_int src_len, char **dest); #endif /* PHP_UUENCODE_H */ diff --git a/ext/standard/uuencode.c b/ext/standard/uuencode.c index 76701ff..b44b019 100644 --- a/ext/standard/uuencode.c +++ b/ext/standard/uuencode.c @@ -65,9 +65,9 @@ #define PHP_UU_DEC(c) (((c) - ' ') & 077) -PHPAPI int php_uuencode(char *src, int src_len, char **dest) /* {{{ */ +PHPAPI zend_str_size_int php_uuencode(char *src, zend_str_size_int src_len, char **dest) /* {{{ */ { - int len = 45; + zend_str_size_int len = 45; char *p, *s, *e, *ee; /* encoded length is ~ 38% greater than the original */ @@ -124,11 +124,12 @@ PHPAPI int php_uuencode(char *src, int src_len, char **dest) /* {{{ */ } /* }}} */ -PHPAPI int php_uudecode(char *src, int src_len, char **dest) /* {{{ */ +PHPAPI zend_str_size_int php_uudecode(char *src, zend_str_size_int src_len, char **dest, int *error) /* {{{ */ { - int len, total_len=0; + zend_str_size_int len, total_len=0; char *s, *e, *p, *ee; + *error = 0; p = *dest = safe_emalloc((size_t) ceil(src_len * 0.75), 1, 1); s = src; e = src + src_len; @@ -181,7 +182,8 @@ PHPAPI int php_uudecode(char *src, int src_len, char **dest) /* {{{ */ err: efree(*dest); - return -1; + *error = 1; + return 0; } /* }}} */ @@ -190,9 +192,9 @@ err: PHP_FUNCTION(convert_uuencode) { char *src, *dst; - int src_len, dst_len; + zend_str_size_int src_len, dst_len; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &src, &src_len) == FAILURE || src_len < 1) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &src, &src_len) == FAILURE || src_len < 1) { RETURN_FALSE; } @@ -207,14 +209,15 @@ PHP_FUNCTION(convert_uuencode) PHP_FUNCTION(convert_uudecode) { char *src, *dst; - int src_len, dst_len; + zend_str_size_int src_len, dst_len; + int err = 0;; - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &src, &src_len) == FAILURE || src_len < 1) { + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "S", &src, &src_len) == FAILURE || src_len < 1) { RETURN_FALSE; } - dst_len = php_uudecode(src, src_len, &dst); - if (dst_len < 0) { + dst_len = php_uudecode(src, src_len, &dst, &err); + if (err) { php_error_docref(NULL TSRMLS_CC, E_WARNING, "The given parameter is not a valid uuencoded string"); RETURN_FALSE; }

« previous php.cvs (#73510) next »