morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

[PATCH] fix for apply_format()

Browse Source 
fix possible NULL pointer in '%c' callout substitution
and cleanup '%D' debug text
This commit is contained in:
kay.sievers@vrfy.org
2003-12-30 01:07:59 -08:00
committed by Greg KH
parent 0529e2ed2e
commit 647c8fc43e
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
namedev.c
View File

@@ -200,11 +200,12 @@ static void apply_format(struct udevice *udev, unsigned char *string)
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 @@ static void apply_format(struct udevice *udev, unsigned char *string)
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);