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

Tolerate fields with no data, e.g. "Depends: "

Browse Source
This commit is contained in:
Glenn L McGrath 2001-07-14 06:25:54 +00:00
parent 06ef16563b
commit 58a5bd187d
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
archival/dpkg.c
View File

@ -517,10 +517,19 @@ unsigned int fill_package_struct(char *control_buffer)
field_start += (field_length + 1); field_start += (field_length + 1);
seperator_offset = strcspn(field, ":"); seperator_offset = strcspn(field, ":");
if (seperator_offset == 0) {
free(field);
continue;
}
field_name = xstrndup(field, seperator_offset); field_name = xstrndup(field, seperator_offset);
field_value = field + seperator_offset + 1; field_value = field + seperator_offset + 1;
field_value += strspn(field_value, " \n\t"); field_value += strspn(field_value, " \n\t");
/* Should be able to replace this strlen with pointer arithmatic */
if (strlen(field_value) == 0) {
goto fill_package_struct_cleanup; // Oh no, the dreaded goto statement !!
}
if (strcmp(field_name, "Package") == 0) { if (strcmp(field_name, "Package") == 0) {
new_node->name = search_name_hashtable(field_value); new_node->name = search_name_hashtable(field_value);
} }
@ -551,6 +560,7 @@ unsigned int fill_package_struct(char *control_buffer)
else if (strcmp(field_name, "Enhances") == 0) { else if (strcmp(field_name, "Enhances") == 0) {
add_split_dependencies(new_node, field_value, EDGE_ENHANCES); add_split_dependencies(new_node, field_value, EDGE_ENHANCES);
} }
fill_package_struct_cleanup:
free(field_name); free(field_name);
free(field); free(field);
} }

10
dpkg.c
View File

@ -517,10 +517,19 @@ unsigned int fill_package_struct(char *control_buffer)
field_start += (field_length + 1); field_start += (field_length + 1);
seperator_offset = strcspn(field, ":"); seperator_offset = strcspn(field, ":");
if (seperator_offset == 0) {
free(field);
continue;
}
field_name = xstrndup(field, seperator_offset); field_name = xstrndup(field, seperator_offset);
field_value = field + seperator_offset + 1; field_value = field + seperator_offset + 1;
field_value += strspn(field_value, " \n\t"); field_value += strspn(field_value, " \n\t");
/* Should be able to replace this strlen with pointer arithmatic */
if (strlen(field_value) == 0) {
goto fill_package_struct_cleanup; // Oh no, the dreaded goto statement !!
}
if (strcmp(field_name, "Package") == 0) { if (strcmp(field_name, "Package") == 0) {
new_node->name = search_name_hashtable(field_value); new_node->name = search_name_hashtable(field_value);
} }
@ -551,6 +560,7 @@ unsigned int fill_package_struct(char *control_buffer)
else if (strcmp(field_name, "Enhances") == 0) { else if (strcmp(field_name, "Enhances") == 0) {
add_split_dependencies(new_node, field_value, EDGE_ENHANCES); add_split_dependencies(new_node, field_value, EDGE_ENHANCES);
} }
fill_package_struct_cleanup:
free(field_name); free(field_name);
free(field); free(field);
} }