Changeset 3777 in MondoRescue for branches/3.3/mondo/src/common/libmondo-devices.c

Timestamp:

Nov 19, 2020, 2:17:57 AM (4 years ago)

Author:

Bruno Cornec

Message:

Fix some remaining memory allocation errors

File:

• branches/3.3/mondo/src/common/libmondo-devices.c (modified) (19 diffs)

branches/3.3/mondo/src/common/libmondo-devices.c

@@ -492 +492 @@
 
     if (!dev[0] || (res = mount_CDROM_here(dev, mountpoint))) {
-        if (!popup_and_get_string("CD-ROM device", "Please enter your CD-ROM's /dev device", dev, MAX_STR_LEN / 4)) {
+        if (!popup_and_get_string("CD-ROM device", "Please enter your CD-ROM's /dev device", dev,(MAX_STR_LEN / 4)-1)) {
             res = 1;
         } else {
@@ -2308 +2308 @@
                 log_msg(1, "bkpinfo->media_device = %s", bkpinfo->media_device);
                 mr_asprintf(comment, "Please specify your %s drive's /dev entry", mds);
-                if (!popup_and_get_string("Device?", comment, bkpinfo->media_device, MAX_STR_LEN / 4)) {
+                if (!popup_and_get_string("Device?", comment, bkpinfo->media_device,(MAX_STR_LEN / 4)-1)) {
                     log_to_screen("User has chosen not to backup the machine");
                     finish(1);
@@ -2331 +2331 @@
             if (!bkpinfo->media_device[0]) {
                 if (bkpinfo->backup_media_type == usb) {
-                    i = popup_and_get_string("/dev entry?", "What is the /dev entry of your USB Disk/Key, please?", bkpinfo->media_device, MAX_STR_LEN / 4);
+                    i = popup_and_get_string("/dev entry?", "What is the /dev entry of your USB Disk/Key, please?", bkpinfo->media_device, (MAX_STR_LEN / 4)-1);
                 } else {
                     if (g_kernel_version < 2.6) {
-                        i = popup_and_get_string("Device node?", "What is the SCSI node of your CD (re)writer, please?", bkpinfo->media_device, MAX_STR_LEN / 4);
+                        i = popup_and_get_string("Device node?", "What is the SCSI node of your CD (re)writer, please?", bkpinfo->media_device,(MAX_STR_LEN / 4)-1);
                     } else {
-                        i = popup_and_get_string("/dev entry?", "What is the /dev entry of your CD (re)writer, please?", bkpinfo->media_device, MAX_STR_LEN / 4);
+                        i = popup_and_get_string("/dev entry?", "What is the /dev entry of your CD (re)writer, please?", bkpinfo->media_device,(MAX_STR_LEN / 4)-1);
                     }
                 }
@@ -2385 +2385 @@
         }
         if (!bkpinfo->media_device[0]) {
-            if (!popup_and_get_string("Device name?", "What is the /dev entry of your tape streamer?", bkpinfo->media_device, MAX_STR_LEN / 4)) {
+            if (!popup_and_get_string("Device name?", "What is the /dev entry of your tape streamer?", bkpinfo->media_device,(MAX_STR_LEN / 4)-1)) {
                 log_to_screen("User has chosen not to backup the machine");
                 finish(1);
@@ -2457 +2457 @@
 #endif
         {
-            if (!popup_and_get_string("Network shared dir.", "Please enter path and directory where archives are stored remotely. (Mondo has taken a guess at the correct value. If it is incorrect, delete it and type the correct one.)", p, MAX_STR_LEN / 4)) {
+            if (!popup_and_get_string("Network shared dir.", "Please enter path and directory where archives are stored remotely. (Mondo has taken a guess at the correct value. If it is incorrect, delete it and type the correct one.)", p,(MAX_STR_LEN / 4)-1)) {
                 log_to_screen("User has chosen not to backup the machine");
                 finish(1);
@@ -2523 +2523 @@
         }
         strcpy(tmp1, bkpinfo->netfs_proto);
-        if (!popup_and_get_string("Network protocol", "Which protocol should I use (nfs/sshfs/smbfs) ?",tmp1, MAX_STR_LEN)) {
+        if (!popup_and_get_string("Network protocol", "Which protocol should I use (nfs/sshfs/smbfs) ?",tmp1, MAX_STR_LEN-1)) {
             log_to_screen("User has chosen not to backup the machine");
             finish(1);
@@ -2531 +2531 @@
 
         strcpy(tmp1, bkpinfo->netfs_mount);
-        if (!popup_and_get_string("Network share", "Which remote share should I mount?", tmp1, MAX_STR_LEN)) {
+        if (!popup_and_get_string("Network share", "Which remote share should I mount?", tmp1, MAX_STR_LEN-1)) {
             log_to_screen("User has chosen not to backup the machine");
             finish(1);
@@ -2543 +2543 @@
             strcpy(tmp1, "");
         }
-        if (!popup_and_get_string("Network user", "Which user should I use if any ?",tmp1, MAX_STR_LEN)) {
+        if (!popup_and_get_string("Network user", "Which user should I use if any ?",tmp1, MAX_STR_LEN-1)) {
             log_to_screen("User has chosen not to backup the machine");
             finish(1);
@@ -2560 +2560 @@
         } else {
             // Why netfsdir ?
-            sprintf(bkpinfo->isodir, "%s/netfsdir", bkpinfo->tmpdir);
+            snprintf(bkpinfo->isodir, (MAX_STR_LEN / 4) -1, "%s/netfsdir", bkpinfo->tmpdir);
             mr_asprintf(command, "mkdir -p %s", bkpinfo->isodir);
             run_program_and_log_output(command, 5);
@@ -2606 +2606 @@
         }
         strcpy(tmp1, bkpinfo->netfs_remote_dir);
-        if (!popup_and_get_string ("Directory", "Which directory within that mountpoint?", tmp1, MAX_STR_LEN)) {
+        if (!popup_and_get_string ("Directory", "Which directory within that mountpoint?", tmp1, MAX_STR_LEN-1)) {
             log_to_screen("User has chosen not to backup the machine");
             finish(1);
@@ -2614 +2614 @@
         bkpinfo->netfs_remote_dir = mr_strip_spaces(tmp1);
 
-        if (!popup_and_get_string("Prefix.", "Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files", bkpinfo->prefix, MAX_STR_LEN / 4)) {
+        if (!popup_and_get_string("Prefix.", "Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files", bkpinfo->prefix,(MAX_STR_LEN / 4)-1)) {
             log_to_screen("User has chosen not to backup the machine");
             finish(1);
@@ -2625 +2625 @@
     case iso:
         if (!bkpinfo->disaster_recovery) {
-            if (!popup_and_get_string("Storage dir.", "Please enter the full path name to the directory for your ISO images.  Example: /mnt/raid0_0", bkpinfo->isodir, MAX_STR_LEN / 4)) {
+            if (!popup_and_get_string("Storage dir.", "Please enter the full path name to the directory for your ISO images.  Example: /mnt/raid0_0", bkpinfo->isodir,(MAX_STR_LEN / 4)-1)) {
                 log_to_screen("User has chosen not to backup the machine");
                 finish(1);
@@ -2648 +2648 @@
             }
         }
-        if (!popup_and_get_string("Prefix.", "Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files", bkpinfo->prefix, MAX_STR_LEN / 4)) {
+        if (!popup_and_get_string("Prefix.", "Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files", bkpinfo->prefix,(MAX_STR_LEN / 4)-1)) {
             log_to_screen("User has chosen not to backup the machine");
             finish(1);
@@ -2672 +2672 @@
 
 #ifdef __FreeBSD__
-            if (!popup_and_get_string("Boot device", "What is your boot device? (e.g. /dev/ad0)", bkpinfo->boot_device, MAX_STR_LEN / 4)) {
+            if (!popup_and_get_string("Boot device", "What is your boot device? (e.g. /dev/ad0)", bkpinfo->boot_device,(MAX_STR_LEN / 4)-1)) {
                 log_to_screen("User has chosen not to backup the machine");
                 finish(1);
@@ -2679 +2679 @@
 #else
             strcpy(tmp1, bkpinfo->boot_device);
-            if (!popup_and_get_string("Boot device", "What is your boot device? (e.g. /dev/hda)", tmp1, MAX_STR_LEN / 4)) {
+            if (!popup_and_get_string("Boot device", "What is your boot device? (e.g. /dev/hda)", tmp1,(MAX_STR_LEN / 4)-1)) {
                 log_to_screen("User has chosen not to backup the machine");
                 finish(1);
@@ -2716 +2716 @@
             strcpy(tmp1, "/");
         }
-        if (!popup_and_get_string("Backup paths", "Please enter paths (separated by '|') which you want me to backup. The default is '/' (i.e. everything).", tmp1, MAX_STR_LEN)) {
+        if (!popup_and_get_string("Backup paths", "Please enter paths (separated by '|') which you want me to backup. The default is '/' (i.e. everything).", tmp1, MAX_STR_LEN-1)) {
             log_to_screen("User has chosen not to backup the machine");
             finish(1);
@@ -2729 +2729 @@
 // NTFS 
         tmp = call_program_and_get_last_line_of_output("mr-parted2fdisk -l 2>/dev/null | grep -i ntfs | awk '{ print $1};' | tr -s '\\n' ' ' | awk '{ print $0};'");
-        strncpy(tmp1, tmp, MAX_STR_LEN / 4);
+        strncpy(tmp1, tmp,(MAX_STR_LEN / 4)-1);
         mr_free(tmp);
         if (strlen(tmp1) > 2) {
-            if (!popup_and_get_string("NTFS partitions", "Please enter/confirm the NTFS partitions you wish to backup as well.", tmp1, MAX_STR_LEN / 4)) {
+            if (!popup_and_get_string("NTFS partitions", "Please enter/confirm the NTFS partitions you wish to backup as well.", tmp1,(MAX_STR_LEN / 4)-1)) {
                 log_to_screen("User has chosen not to backup the machine");
                 finish(1);
             }
-            strncpy(bkpinfo->image_devs, tmp1, MAX_STR_LEN / 4);
+            strncpy(bkpinfo->image_devs, tmp1, (MAX_STR_LEN / 4)-1);
         }
 
@@ -2755 +2755 @@
         mr_asprintf(oldtmp, "%s", bkpinfo->tmpdir);
         if (bkpinfo->tmpdir != NULL ) {
-            strncpy(p,bkpinfo->tmpdir,(16*MAX_STR_LEN)-1);
+            strncpy(p,bkpinfo->tmpdir,(MAX_STR_LEN / 4)-1);
         } else {
             p[0] = '\0';
@@ -2771 +2771 @@
         mr_asprintf(oldtmp, "%s", bkpinfo->scratchdir);
         if (bkpinfo->scratchdir != NULL ) {
-            strncpy(p,bkpinfo->scratchdir,(16*MAX_STR_LEN)-1);
+            strncpy(p,bkpinfo->scratchdir,(MAX_STR_LEN / 4)-1);
         } else {
             p[0] = '\0';