Process extra empty lines correctly.

git-svn-id: svn://busybox.net/trunk/busybox@3544 69ca8d6d-28ef-0310-b511-8ec308f3f277

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;