i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pc_serial: more NULL checks

Browse Source
This commit is contained in:
François Revol
2014-08-29 17:09:01 +02:00
parent 432da9e337
commit 039f88d807
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/ports/pc_serial/Driver.cpp
+12 -1
View File
@@ -480,6 +480,10 @@ next_split:
device = new(std::nothrow) SerialDevice(supported, ioport, irq, master); device = new(std::nothrow) SerialDevice(supported, ioport, irq, master);
if (device == NULL) {
TRACE_ALWAYS("can't allocate device\n");
continue;
}
if (pc_serial_insert_device(device) < B_OK) { if (pc_serial_insert_device(device) < B_OK) {
TRACE_ALWAYS("can't insert device\n"); TRACE_ALWAYS("can't insert device\n");
@@ -522,7 +526,7 @@ scan_isa_hardcoded()
SerialDevice *device; SerialDevice *device;
device = new(std::nothrow) SerialDevice(&sSupportedDevices[0], device = new(std::nothrow) SerialDevice(&sSupportedDevices[0],
sHardcodedPorts[i].ioBase, sHardcodedPorts[i].irq); sHardcodedPorts[i].ioBase, sHardcodedPorts[i].irq);
if (device && device->Probe()) if (device != NULL && device->Probe())
pc_serial_insert_device(device); pc_serial_insert_device(device);
else else
delete device; delete device;
@@ -654,6 +658,10 @@ next_split_alt:
/**/ /**/
device = new(std::nothrow) SerialDevice(supported, ioport, irq, master); device = new(std::nothrow) SerialDevice(supported, ioport, irq, master);
if (device == NULL) {
TRACE_ALWAYS("can't allocate device\n");
continue;
}
if (pc_serial_insert_device(device) < B_OK) { if (pc_serial_insert_device(device) < B_OK) {
TRACE_ALWAYS("can't insert device\n"); TRACE_ALWAYS("can't insert device\n");
@@ -681,6 +689,9 @@ check_kernel_debug_port()
long int value; long int value;
handle = load_driver_settings("kernel"); handle = load_driver_settings("kernel");
if (handle == NULL)
return;
const char *str = get_driver_parameter(handle, "serial_debug_port", const char *str = get_driver_parameter(handle, "serial_debug_port",
NULL, NULL); NULL, NULL);
if (str != NULL) { if (str != NULL) {