Patch for parm/loadparm.c

Billy O'Connor billy at oconnoronline.net
Thu Jun 6 07:17:03 GMT 2002


This patch corrects a problem with testparm segfaulting and swat
aborting on startup.  I'm still looking into when in the revision
history it started happening, it was recently.

--- samba/source/param/loadparm.c	Thu May 30 20:47:19 2002
+++ samba_test/source/param/loadparm.c	Thu Jun  6 09:37:51 2002
@@ -3422,13 +3422,24 @@
 				break;
 			case P_STRING:
 			case P_USTRING:
-				parm_table[i].def.svalue =
-					strdup(*(char **)parm_table[i].ptr);
+                                if( parm_table[i].ptr ) {
+				    parm_table[i].def.svalue =
+					    strdup(*(char **)parm_table[i].ptr);
+                                }
+                                else {
+                                    parm_table[i].def.svalue = NULL;
+                                }
 				break;
 			case P_GSTRING:
 			case P_UGSTRING:
-				parm_table[i].def.svalue =
-					strdup((char *)parm_table[i].ptr);
+                                if( parm_table[i].ptr ) {
+				    parm_table[i].def.svalue =
+					    strdup((char *)parm_table[i].ptr);
+                                }
+                                else {
+                                    parm_table[i].def.svalue = NULL;
+                                }
+
 				break;
 			case P_BOOL:
 			case P_BOOLREV:




More information about the samba-technical mailing list