Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
- Fix #51002, fix possible memory corruption with very long names
  • Loading branch information
pierrejoye committed Jun 15, 2010
1 parent 33ac0d0 commit 2cfb5e4
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions ext/zip/php_zip.c
Expand Up @@ -280,8 +280,8 @@ static int php_zip_extract_file(struct zip * za, char *dest, char *file, int fil
}
/* }}} */

static int php_zip_add_file(struct zip *za, const char *filename, int filename_len,
char *entry_name, int entry_name_len, long offset_start, long offset_len TSRMLS_DC) /* {{{ */
static int php_zip_add_file(struct zip *za, const char *filename, size_t filename_len,
char *entry_name, size_t entry_name_len, long offset_start, long offset_len TSRMLS_DC) /* {{{ */
{
struct zip_source *zs;
int cur_idx;
Expand Down Expand Up @@ -1629,7 +1629,7 @@ static void php_zip_add_from_pattern(INTERNAL_FUNCTION_PARAMETERS, int type) /*

for (i = 0; i < found; i++) {
char *file, *file_stripped, *entry_name;
int entry_name_len,file_stripped_len;
size_t entry_name_len, file_stripped_len;
char entry_name_buf[MAXPATHLEN];
char *basename = NULL;

Expand Down

0 comments on commit 2cfb5e4

Please sign in to comment.