Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP1:Update
fastjar
fastjar-CVE-2010-2322.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File fastjar-CVE-2010-2322.patch of Package fastjar
diff -PpuriN a/jartool.c b/jartool.c --- a/jartool.c 2021-07-23 08:57:35.882954985 +0200 +++ b/jartool.c 2021-07-23 08:56:52.718947506 +0200 @@ -1258,7 +1258,7 @@ int add_file_to_jar(int jfd, int ffd, co exit_on_error("write"); /* write the file name to the zip file */ - if (1 == write(jfd, fname, file_name_length)) + if (-1 == write(jfd, fname, file_name_length)) exit_on_error("write"); if(verbose){ @@ -1274,15 +1274,18 @@ int add_file_to_jar(int jfd, int ffd, co compress_file(ffd, jfd, ze, existing); } else { /* If we are not writing the last entry, make space for it. */ - if (existing && existing->next_entry) + if (existing) { - if (ze->usize > existing->usize) + if (existing->next_entry) { - if (shift_down (jfd, existing->next_entry->offset, - ze->usize - existing->usize, existing->next_entry)) + if (ze->usize > existing->usize) { - fprintf (stderr, "%s: %s\n", progname, strerror (errno)); - return 1; + if (shift_down (jfd, existing->next_entry->offset, + ze->usize - existing->usize, existing->next_entry)) + { + fprintf (stderr, "%s: %s\n", progname, strerror (errno)); + return 1; + } } } } @@ -1731,12 +1734,12 @@ int extract_jar(int fd, const char **fil struct stat sbuf; int depth = 0; - if(strncmp((const char *)filename, "/", 1) == 0){ - fprintf(stderr, "Absolute path names are not allowed.\n"); - exit(EXIT_FAILURE); + if(*filename == '/'){ + fprintf(stderr, "Absolute path names are not allowed.\n"); + exit(EXIT_FAILURE); } - tmp_buff = malloc(sizeof(char) * strlen((const char *)filename)); + tmp_buff = malloc(strlen((const char *)filename)); if(tmp_buff == NULL) { fprintf(stderr, "Out of memory.\n"); @@ -1749,27 +1752,27 @@ int extract_jar(int fd, const char **fil if(idx == NULL) break; else if(idx == start){ + tmp_buff[idx - filename] = '/'; start++; continue; } - start = idx + 1; - strncpy(tmp_buff, (const char *)filename, (idx - filename)); - tmp_buff[(idx - filename)] = '\0'; + memcpy(tmp_buff + (start - filename), (const char *)start, (idx - start)); + tmp_buff[idx - filename] = '\0'; #ifdef DEBUG printf("checking the existance of %s\n", tmp_buff); #endif - if(strcmp(tmp_buff, "..") == 0 || (strlen(tmp_buff) > 2 && strncmp(tmp_buff + strlen(tmp_buff) - 3, "/..", 3) == 0)){ - --depth; - if (depth < 0){ - fprintf(stderr, "Traversal to parent directories during unpacking!\n"); - exit(EXIT_FAILURE); - } - } else if (strcmp(tmp_buff, ".") == 0 || (strlen(tmp_buff) > 1 && strncmp(tmp_buff + strlen(tmp_buff) - 2, "/.", 2) == 0)){ - /* Do nothing, the current directory is "." */ - } else - ++depth; + if(idx - start == 2 && memcmp(start, "..", 2) == 0){ + --depth; + if (depth < 0){ + fprintf(stderr, "Traversal to parent directories during unpacking!\n"); + exit(EXIT_FAILURE); + } + } else if (idx - start != 1 || *start != '.') + ++depth; + + start = idx + 1; if(stat(tmp_buff, &sbuf) < 0){ if(errno != ENOENT) @@ -1779,6 +1782,7 @@ int extract_jar(int fd, const char **fil #ifdef DEBUG printf("Directory exists\n"); #endif + tmp_buff[idx - filename] = '/'; continue; }else { fprintf(stderr, "Hmmm.. %s exists but isn't a directory!\n", @@ -1795,10 +1799,11 @@ int extract_jar(int fd, const char **fil if(verbose && handle) printf("%10s: %s/\n", "created", tmp_buff); + tmp_buff[idx - filename] = '/'; } /* only a directory */ - if(strlen((const char *)start) == 0) + if(*start == '\0') dir = TRUE; #ifdef DEBUG @@ -1806,7 +1811,7 @@ int extract_jar(int fd, const char **fil #endif /* If the entry was just a directory, don't write to file, etc */ - if(strlen((const char *)start) == 0) + if(*start == '\0') f_fd = -1; free(tmp_buff); @@ -1890,7 +1895,8 @@ int extract_jar(int fd, const char **fil exit(EXIT_FAILURE); } - close(f_fd); + if (f_fd != -1) + close(f_fd); if(verbose && dir == FALSE && handle) printf("%10s: %s\n",
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor