From a7512d74fa64649cdd93602a00046b4ba028cea9 Mon Sep 17 00:00:00 2001 From: Matt Kraai Date: Thu, 18 Oct 2001 17:03:59 +0000 Subject: Process extra empty lines correctly. --- archival/dpkg.c | 6 +++++- dpkg.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/archival/dpkg.c b/archival/dpkg.c index 95c8b88cb..d566bfe5b 100644 --- a/archival/dpkg.c +++ b/archival/dpkg.c @@ -769,7 +769,11 @@ void write_status_file(deb_file_t **deb_file) /* Update previously known packages */ while ((control_buffer = fgets_str(old_status_file, "\n\n")) != NULL) { - tmp_string = strstr(control_buffer, "Package:") + 8; + if ((tmp_string = strstr(control_buffer, "Package:")) == NULL) { + continue; + } + + tmp_string += 8; tmp_string += strspn(tmp_string, " \n\t"); package_name = xstrndup(tmp_string, strcspn(tmp_string, "\n\0")); write_flag = FALSE; diff --git a/dpkg.c b/dpkg.c index 95c8b88cb..d566bfe5b 100644 --- a/dpkg.c +++ b/dpkg.c @@ -769,7 +769,11 @@ void write_status_file(deb_file_t **deb_file) /* Update previously known packages */ while ((control_buffer = fgets_str(old_status_file, "\n\n")) != NULL) { - tmp_string = strstr(control_buffer, "Package:") + 8; + if ((tmp_string = strstr(control_buffer, "Package:")) == NULL) { + continue; + } + + tmp_string += 8; tmp_string += strspn(tmp_string, " \n\t"); package_name = xstrndup(tmp_string, strcspn(tmp_string, "\n\0")); write_flag = FALSE; -- cgit v1.2.3