From 6b74aa267377be9ff009b5d027061d31af5f9af1 Mon Sep 17 00:00:00 2001
From: "Markus F.X.J. Oberhumer" <markus@oberhumer.com>
Date: Thu, 12 Sep 2002 01:20:36 +0000
Subject: [PATCH] Small updates.

committer: mfx <mfx> 1031793636 +0000
---
 src/packer.cpp |  2 +-
 src/ui.cpp     | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/packer.cpp b/src/packer.cpp
index 6114385f..8cbc4b65 100644
--- a/src/packer.cpp
+++ b/src/packer.cpp
@@ -958,7 +958,7 @@ void Packer::initLoader(const void *pdata, int plen, int pinfo)
         pinfo =  (pinfo + 3) &~ 3;
     }
 
-    delete linker;
+    delete linker; linker = NULL;
     if (getFormat() < 128)
         linker = new Linker(pdata, plen, pinfo);    // little endian
     else
diff --git a/src/ui.cpp b/src/ui.cpp
index 5ac17150..40eaac85 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -143,12 +143,22 @@ static const char *mkline(unsigned long fu_len, unsigned long fc_len,
                           bool decompress=false)
 {
     static char buf[2000];
-    char r[7+1];
+    char r[7+1] = "";
     char fn[13+1];
     const char *f;
 
+    // Large ratios can happen because of overlays that are
+    // appended after a program is packed.
     unsigned ratio = get_ratio(fu_len, fc_len);
-    upx_snprintf(r, sizeof(r), "%3d.%02d%%", ratio / 10000, (ratio % 10000) / 100);
+#if 1
+    if (ratio >= 1000*1000)
+        strcpy(r, "overlay");
+#else
+    if (ratio >= 10*1000*1000)      // >= "1000%"
+        strcpy(r, "999.99%");
+#endif
+    else
+        upx_snprintf(r, sizeof(r), "%3d.%02d%%", ratio / 10000, (ratio % 10000) / 100);
     if (decompress)
         f = "%10ld <-%10ld  %7s  %13s  %s";
     else