Changeset 411 for branches/samba-3.3.x/source/libsmb/libsmb_context.c

Timestamp:

Mar 1, 2010, 3:05:48 PM (15 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3.x to 3.3.11

File:

• branches/samba-3.3.x/source/libsmb/libsmb_context.c (modified) (6 diffs)

branches/samba-3.3.x/source/libsmb/libsmb_context.c

@@ -193 +193 @@
         
         /* Things we have to clean up */
-        free(smbc_getWorkgroup(context));
         smbc_setWorkgroup(context, NULL);
-
-        free(smbc_getNetbiosName(context));
         smbc_setNetbiosName(context, NULL);
-
-        free(smbc_getUser(context));
         smbc_setUser(context, NULL);
         
@@ -424 +419 @@
 {
         int pid;
-        char *user = NULL;
         char *home = NULL;
         
@@ -533 +527 @@
                  * FIXME: Is this the best way to get the user info?
                  */
-                user = getenv("USER");
+                char *user = getenv("USER");
                 /* walk around as "guest" if no username can be found */
                 if (!user) {
@@ -547 +541 @@
 
                 smbc_setUser(context, user);
+                SAFE_FREE(user);
+
+                if (!smbc_getUser(context)) {
+                        errno = ENOMEM;
+                        return NULL;
+                }
         }
         
@@ -579 +579 @@
                 
                 smbc_setNetbiosName(context, netbios_name);
+                SAFE_FREE(netbios_name);
+
+                if (!smbc_getNetbiosName(context)) {
+                        errno = ENOMEM;
+                        return NULL;
+                }
         }
         
@@ -600 +606 @@
 
                 smbc_setWorkgroup(context, workgroup);
+                SAFE_FREE(workgroup);
+
+                if (!smbc_getWorkgroup(context)) {
+                        errno = ENOMEM;
+                        return NULL;
+                }
         }