Changeset 877 in MondoRescue

Timestamp:

Oct 5, 2006, 11:47:22 PM (18 years ago)

Author:

andree

Message:

Use strncpy() instead of strcpy() in popup_with_buttons() to avoid
segmentation fault for too long texts. Shorten text for pop-up about
CD writer device accordingly.

Also addresses Debian bug #391127.

Location:

branches/stable/mondo/mondo/common

Files:

• libmondo-devices.c (modified) (1 diff)
• newt-specific.c (modified) (1 diff)

branches/stable/mondo/mondo/common/libmondo-devices.c

@@ -1962 +1962 @@
             if (bkpinfo->media_device[0]) {
                 sprintf(tmp,
-                        "I think I've found your %s burner at SCSI node %s; am I right on the money? (Say no if you have an IDE burner and you are running a 2.6 kernel. Instead, specify the IDE burner's /dev address at the next screen.)",
+                        "I think I've found your %s burner at SCSI node %s. Is this correct? (Say no if you have an IDE burner and you are running a 2.6 kernel. You will then be prompted for further details.)",
                         media_descriptor_string(bkpinfo->
                                                 backup_media_type),

branches/stable/mondo/mondo/common/newt-specific.c

@@ -927 +927 @@
         }
 
-        strcpy(prompt, p);
+        strncpy(prompt, p, MAX_NEWT_COMMENT_LEN - 1);
+        prompt[MAX_NEWT_COMMENT_LEN] = '\0';
         text = newtTextboxReflowed(1, 1, prompt, 40, 5, 5, 0);
         b_1 =