Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PVS-645: invalid/dangerous use of strncat.

Browse Source 
Just don't use strncat.

Change-Id: I17efce87cf2ca7f621f98fb0c6679f48f631e98b
Reviewed-on: https://review.haiku-os.org/c/1595
Reviewed-by: waddlesplash <waddlesplash@gmail.com>
This commit is contained in:
Adrien Destugues 2019-07-15 20:46:10 +02:00 committed by waddlesplash
parent 0df9e45c20
commit 85965aba7a
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/add-ons/kernel/bus_managers/acpi/NamespaceDump.cpp
View File

@ -98,50 +98,50 @@ dump_acpi_namespace(acpi_ns_device_info *device, char *root, int indenting)
snprintf(output, sizeof(output), "%s%s", tabs, result + depth);
switch(type) {
case ACPI_TYPE_INTEGER:
strncat(output, " INTEGER", sizeof(output));
strlcat(output, " INTEGER", sizeof(output));
break;
case ACPI_TYPE_STRING:
strncat(output, " STRING", sizeof(output));
strlcat(output, " STRING", sizeof(output));
break;
case ACPI_TYPE_BUFFER:
strncat(output, " BUFFER", sizeof(output));
strlcat(output, " BUFFER", sizeof(output));
break;
case ACPI_TYPE_PACKAGE:
strncat(output, " PACKAGE", sizeof(output));
strlcat(output, " PACKAGE", sizeof(output));
break;
case ACPI_TYPE_FIELD_UNIT:
strncat(output, " FIELD UNIT", sizeof(output));
strlcat(output, " FIELD UNIT", sizeof(output));
break;
case ACPI_TYPE_DEVICE:
hid[0] = 0; /* zero-terminate string; get_device_hid can (and will) fail! */
device->acpi->get_device_hid(result, hid, sizeof(hid));
strncat(output, " DEVICE (", sizeof(output));
strncat(output, hid, sizeof(output));
strncat(output, ")", sizeof(output));
strlcat(output, " DEVICE (", sizeof(output));
strlcat(output, hid, sizeof(output));
strlcat(output, ")", sizeof(output));
break;
case ACPI_TYPE_EVENT:
strncat(output, " EVENT", sizeof(output));
strlcat(output, " EVENT", sizeof(output));
break;
case ACPI_TYPE_METHOD:
strncat(output, " METHOD", sizeof(output));
strlcat(output, " METHOD", sizeof(output));
break;
case ACPI_TYPE_MUTEX:
strncat(output, " MUTEX", sizeof(output));
strlcat(output, " MUTEX", sizeof(output));
break;
case ACPI_TYPE_REGION:
strncat(output, " REGION", sizeof(output));
strlcat(output, " REGION", sizeof(output));
break;
case ACPI_TYPE_POWER:
strncat(output, " POWER", sizeof(output));
strlcat(output, " POWER", sizeof(output));
break;
case ACPI_TYPE_PROCESSOR:
strncat(output, " PROCESSOR", sizeof(output));
strlcat(output, " PROCESSOR", sizeof(output));
break;
case ACPI_TYPE_THERMAL:
strncat(output, " THERMAL", sizeof(output));
strlcat(output, " THERMAL", sizeof(output));
break;
case ACPI_TYPE_BUFFER_FIELD:
strncat(output, " BUFFER_FIELD", sizeof(output));
strlcat(output, " BUFFER_FIELD", sizeof(output));
break;
case ACPI_TYPE_ANY:
default:

6
src/add-ons/kernel/bus_managers/virtio/VirtioDevice.cpp
View File

@ -280,9 +280,9 @@ VirtioDevice::_DumpFeatures(const char* title, uint32 features,
if (name == NULL)
name = get_feature_name(feature);
if (name != NULL) {
strncat(features_string, "[", sizeof(features_string));
strncat(features_string, name, sizeof(features_string));
strncat(features_string, "] ", sizeof(features_string));
strlcat(features_string, "[", sizeof(features_string));
strlcat(features_string, name, sizeof(features_string));
strlcat(features_string, "] ", sizeof(features_string));
}
}
TRACE("%s: %s\n", title, features_string);