[PATCH] fix for apply_format()
fix possible NULL pointer in '%c' callout substitution and cleanup '%D' debug text
This commit is contained in:
parent
0529e2ed2e
commit
647c8fc43e
|
@ -200,11 +200,12 @@ static void apply_format(struct udevice *udev, unsigned char *string)
|
||||||
case 'D':
|
case 'D':
|
||||||
if (strlen(udev->kernel_number) == 0) {
|
if (strlen(udev->kernel_number) == 0) {
|
||||||
strcat(pos, "disc");
|
strcat(pos, "disc");
|
||||||
|
dbg("substitute devfs disc");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
strcat(pos, "part");
|
strcat(pos, "part");
|
||||||
strcat(pos, udev->kernel_number);
|
strcat(pos, udev->kernel_number);
|
||||||
dbg("substitute kernel number '%s'", udev->kernel_number);
|
dbg("substitute devfs part '%s'", udev->kernel_number);
|
||||||
break;
|
break;
|
||||||
case 'm':
|
case 'm':
|
||||||
sprintf(pos, "%u", udev->minor);
|
sprintf(pos, "%u", udev->minor);
|
||||||
|
@ -229,8 +230,10 @@ static void apply_format(struct udevice *udev, unsigned char *string)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
strcat(pos, pos3);
|
if (pos3) {
|
||||||
dbg("substitute partial callout output '%s'", pos3);
|
strcat(pos, pos3);
|
||||||
|
dbg("substitute partial callout output '%s'", pos3);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
strcat(pos, udev->callout_value);
|
strcat(pos, udev->callout_value);
|
||||||
dbg("substitute callout output '%s'", udev->callout_value);
|
dbg("substitute callout output '%s'", udev->callout_value);
|
||||||
|
|
Loading…
Reference in New Issue