ncurses 6.2 - patch 20200509

[ncurses.git] / form / fty_enum.c

diff --git a/form/fty_enum.c b/form/fty_enum.c
index 41ff585cdde5a92b944fdb7f0501aa964e624327..71978e3aeebd9c79aa6c5b860ec320b1f47635f5 100644 (file)
--- a/form/fty_enum.c
+++ b/form/fty_enum.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc.              *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 1998-2009,2010 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -34,7 +35,7 @@
 
 #include "form.priv.h"
 
-MODULE_ID("$Id: fty_enum.c,v 1.25 2010/01/23 21:14:36 tom Exp $")
+MODULE_ID("$Id: fty_enum.c,v 1.27 2020/02/02 23:34:34 tom Exp $")
 
 typedef struct
   {
@@ -102,12 +103,14 @@ Generic_Enum_Type(void *arg)
              argp->kwds = typeMalloc(char *, cnt + 1);
 
              kp = kwds;
-             kptarget = argp->kwds;
-             while (kptarget && kp && (*kp))
+             if ((kptarget = argp->kwds) != 0)
                {
-                 (*kptarget++) = strdup(*kp++);
+                 while (kp && (*kp))
+                   {
+                     (*kptarget++) = strdup(*kp++);
+                   }
+                 *kptarget = (char *)0;
                }
-             *kptarget = (char *)0;
            }
        }
     }
@@ -164,12 +167,14 @@ Copy_Enum_Type(const void *argp)
              char **kp = ap->kwds;
              result->kwds = typeMalloc(char *, 1 + ap->count);
 
-             kptarget = result->kwds;
-             while (kptarget && kp && (*kp))
+             if ((kptarget = result->kwds) != 0)
                {
-                 (*kptarget++) = strdup(*kp++);
+                 while (kp && (*kp))
+                   {
+                     (*kptarget++) = strdup(*kp++);
+                   }
+                 *kptarget = (char *)0;
                }
-             *kptarget = (char *)0;
            }
        }
     }