Release 10.35.74

git-svn-id: http://svn.code.sf.net/p/netpbm/code/super_stable@1158 9d0c8265-081b-0410-96cb-a4ca84ce46f8

2 files changed, 16 insertions, 2 deletions

diff --git a/lib/libpbmfont.c b/lib/libpbmfont.c
index c7b5a355..54cae478 100644
--- a/lib/libpbmfont.c
+++ b/lib/libpbmfont.c
@@ -1132,5 +1132,17 @@ int mk_max;
             s++;
     }
     vec[n] = 0;
+
+    /* Caller expects there to be at least one element in vec[], so we
+       can't return an empty line.  More advanced releases of Netpbm
+       just ignore blank lines.  If important, we can fairly easily port
+       the required code back to this release, by replacing readline()
+       with a current one, modified somewhat so it compiles here.
+
+       - Bryan 2010.03.23 
+    */
+    if (n < 1)
+        pm_error("Invalid font file -- contains a blank line");
+
     return n;
 }
diff --git a/lib/libsystem.c b/lib/libsystem.c
index 094480e7..6919bf2c 100644
--- a/lib/libsystem.c
+++ b/lib/libsystem.c
@@ -216,12 +216,14 @@ signalName(unsigned int const signalClass) {
             return "SIGWINCH";
         case SIGIO:
             return "SIGIO";
-        case SIGPWR:
-            return "SIGPWR";
         case SIGSYS:
             return "SIGSYS";
         default:
             return "???";
+
+            /* There are various other signal classes on some systems, but
+               not defined by POSIX, including: SIGPWR, SIGLOST, SIGINFO
+            */
         }
     } else if ((int)signalClass >= SIGRTMIN && (int)signalClass <= SIGRTMAX)
         return "SIGRTxxx";