X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=form%2Ffty_enum.c;h=d3351644ef1849f2aa9de6dfd7ab31674cc08e8c;hp=41ff585cdde5a92b944fdb7f0501aa964e624327;hb=0fbd5e192896b3e446832d0a451df2cec5f5ae40;hpb=c6540b9c89dda1a6a8bd681726831e8924176504

diff --git a/form/fty_enum.c b/form/fty_enum.c
index 41ff585c..d3351644 100644
--- a/form/fty_enum.c
+++ b/form/fty_enum.c
@@ -34,7 +34,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.26 2010/05/01 21:11:07 tom Exp $")
 
 typedef struct
   {
@@ -102,12 +102,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 +166,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;
 	    }
 	}
     }