Changeset 3465 in MondoRescue

Timestamp:

Sep 11, 2015, 10:55:49 AM (9 years ago)

Author:

Bruno Cornec

Message:

-Improve memory management of netfs_user by duplicating systematically strings instead of optimizing by reusing content (should fix #766)

File:

• branches/3.2/mondo/src/common/libmondo-cli.c (modified) (3 diffs)

branches/3.2/mondo/src/common/libmondo-cli.c

@@ -153 +153 @@
     char *p = NULL;
     char *q = NULL;
+    char *q2 = NULL;
 
     long itbs = 0L;
@@ -440 +441 @@
         /* p points on to the string server:/path */
         /* Store the 2 values */
-        /*  using memmove instead of strcpy as per #584 */
-        /* memmove(bkpinfo->netfs_mount, p, MAX_STR_LEN); */
-        bkpinfo->netfs_mount = p;
+        q2 = bkpinfo->netfs_mount;
+        mr_asprintf(bkpinfo->netfs_mount, "%s", p);
+        mr_free(q2);
 
         /* test if we specified a user */
@@ -448 +449 @@
         if (p != NULL) {
             /* User found. Store the 2 values */
-            bkpinfo->netfs_user = bkpinfo->netfs_mount;
+            mr_asprintf(bkpinfo->netfs_user, "%s", bkpinfo->netfs_mount);
+            p = strchr(bkpinfo->netfs_user, '@');
+            *p = '\0';
+            p = strchr(bkpinfo->netfs_mount, '@');
             p++;
             /* new netfs mount */
+            q2 = bkpinfo->netfs_mount;
             mr_asprintf(bkpinfo->netfs_mount, "%s", p);
-            /* now that user is computed, create the right value by removing end of string */
-            p--;
-            *p = '\0';
+            mr_free(q2);
         }
         if (bkpinfo->netfs_user != NULL) {