Changeset 250

Timestamp:

Aug 16, 2005, 5:12:10 PM (20 years ago)

Author:

root

Message:

rewrite_archiverbb2: avoid dereferencing null signature
ArcReviewDlgProc: ensure signature allocated

File:

• trunk/dll/avv.c (modified) (7 diffs)

trunk/dll/avv.c

@@ -15 +15 @@
   01 Aug 04 SHL Rework fixup usage
   06 Jun 05 SHL Drop unused
+  14 Aug 05 SHL rewrite_archiverbb2: avoid dereferencing null signature
+  14 Aug 05 SHL ArcReviewDlgProc: ensure signature allocated
 
 ***********************************************************************/
@@ -20 +22 @@
 #define INCL_DOS
 #define INCL_WIN
-
 #include <os2.h>
+
 #include <stdlib.h>
 #include <stdio.h>
@@ -28 +30 @@
 #include <ctype.h>
 #include <time.h>
+
 #include "fm3dll.h"
 #include "fm3dlg.h"
@@ -222 +225 @@
   INT         counter = 0;
   ARC_TYPE    *info;
-  static CHAR s[258];
+  CHAR        s[258];
   CHAR        *p;
 
@@ -289 +292 @@
                     s,
                     sizeof(s),
-                    strlen(info->signature)),
+                    info->signature ? strlen(info->signature) : 0),
               nonull(info->startlist),
               nonull(info->endlist),
@@ -410 +413 @@
 
 
-MRESULT EXPENTRY ArcReviewDlgProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+MRESULT EXPENTRY ArcReviewDlgProc(HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
 {
   ARCDUMP       *admp;
@@ -873 +876 @@
           admp->info->exwdirs = xstrdup_from_window(hwnd,AD_WDIRS,admp->info->exwdirs);
           admp->info->ext = xstrdup_from_window(hwnd,AD_EXT,admp->info->ext);
-          literal(xstrdup_from_window(hwnd,
-                                       AD_SIG,
-                                       admp->info->signature));
+          admp->info->signature = xstrdup_from_window(hwnd,
+                                                      AD_SIG,
+                                                      admp->info->signature);
+          literal(admp->info->signature);
           admp->info->list = xstrdup_from_window(hwnd,
                                                   AD_LIST,