emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use xfopen to abort on error to prevent segfaulting later.

Browse Source
This commit is contained in:
Glenn L McGrath 2001-07-18 03:13:49 +00:00
parent bc4c030023
commit 4cdc607f72
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archival/dpkg.c
View File

@ -643,7 +643,7 @@ void index_status_file(const char *filename)
status_node_t *status_node = NULL; status_node_t *status_node = NULL;
unsigned int status_num; unsigned int status_num;
status_file = fopen(filename, "r"); status_file = xfopen(filename, "r");
while ((control_buffer = fgets_str(status_file, "\n\n")) != NULL) { while ((control_buffer = fgets_str(status_file, "\n\n")) != NULL) {
const unsigned int package_num = fill_package_struct(control_buffer); const unsigned int package_num = fill_package_struct(control_buffer);
if (package_num != -1) { if (package_num != -1) {
@ -1036,7 +1036,7 @@ char **create_list(const char *filename)
int length = 0; int length = 0;
int count = 0; int count = 0;
list_stream = fopen(filename, "r"); list_stream = xfopen(filename, "r");
if (list_stream == NULL) { if (list_stream == NULL) {
return(NULL); return(NULL);
} }
@ -1246,7 +1246,7 @@ void unpack_package(deb_file_t *deb_file)
/* Create the list file */ /* Create the list file */
strcat(info_prefix, "list"); strcat(info_prefix, "list");
out_stream = wfopen(info_prefix, "w"); out_stream = xfopen(info_prefix, "w");
deb_extract(deb_file->filename, out_stream, (extract_quiet | extract_data_tar_gz | extract_list), NULL, NULL); deb_extract(deb_file->filename, out_stream, (extract_quiet | extract_data_tar_gz | extract_list), NULL, NULL);
fclose(out_stream); fclose(out_stream);

6
dpkg.c
View File

@ -643,7 +643,7 @@ void index_status_file(const char *filename)
status_node_t *status_node = NULL; status_node_t *status_node = NULL;
unsigned int status_num; unsigned int status_num;
status_file = fopen(filename, "r"); status_file = xfopen(filename, "r");
while ((control_buffer = fgets_str(status_file, "\n\n")) != NULL) { while ((control_buffer = fgets_str(status_file, "\n\n")) != NULL) {
const unsigned int package_num = fill_package_struct(control_buffer); const unsigned int package_num = fill_package_struct(control_buffer);
if (package_num != -1) { if (package_num != -1) {
@ -1036,7 +1036,7 @@ char **create_list(const char *filename)
int length = 0; int length = 0;
int count = 0; int count = 0;
list_stream = fopen(filename, "r"); list_stream = xfopen(filename, "r");
if (list_stream == NULL) { if (list_stream == NULL) {
return(NULL); return(NULL);
} }
@ -1246,7 +1246,7 @@ void unpack_package(deb_file_t *deb_file)
/* Create the list file */ /* Create the list file */
strcat(info_prefix, "list"); strcat(info_prefix, "list");
out_stream = wfopen(info_prefix, "w"); out_stream = xfopen(info_prefix, "w");
deb_extract(deb_file->filename, out_stream, (extract_quiet | extract_data_tar_gz | extract_list), NULL, NULL); deb_extract(deb_file->filename, out_stream, (extract_quiet | extract_data_tar_gz | extract_list), NULL, NULL);
fclose(out_stream); fclose(out_stream);