[udev] fix for apply_format()

[Kay Sievers <kay.sievers@vrfy.org>]

[-- Attachment #1: Type: text/plain, Size: 97 bytes --]


fix possible NULL pointer in '%c' callout substitution
and cleanup '%D' debug text

thanks,
Kay

[-- Attachment #2: 07-apply_format-bug.diff --]
[-- Type: text/plain, Size: 903 bytes --]

diff -Nru a/namedev.c b/namedev.c
--- a/namedev.c	Fri Dec 26 02:07:55 2003
+++ b/namedev.c	Fri Dec 26 02:07:55 2003
@@ -200,11 +200,12 @@
 			case 'D':
 				if (strlen(udev->kernel_number) == 0) {
 					strcat(pos, "disc");
+					dbg("substitute devfs disc");
 					break;
 				}
 				strcat(pos, "part");
 				strcat(pos, udev->kernel_number);
-				dbg("substitute kernel number '%s'", udev->kernel_number);
+				dbg("substitute devfs part '%s'", udev->kernel_number);
 				break;
 			case 'm':
 				sprintf(pos, "%u", udev->minor);
@@ -229,8 +230,10 @@
 							break;
 						}
 					}
-					strcat(pos, pos3);
-					dbg("substitute partial callout output '%s'", pos3);
+					if (pos3) {
+						strcat(pos, pos3);
+						dbg("substitute partial callout output '%s'", pos3);
+					}
 				} else {
 					strcat(pos, udev->callout_value);
 					dbg("substitute callout output '%s'", udev->callout_value);