diff --git a/sections/cper-section-generic.c b/sections/cper-section-generic.c
index 05f790f..8882b78 100644
--- a/sections/cper-section-generic.c
+++ b/sections/cper-section-generic.c
@@ -143,7 +143,11 @@
 	const char *brand_string = json_object_get_string(
 		json_object_object_get(section, "cpuBrandString"));
 	if (brand_string != NULL) {
-		strncpy(section_cper->BrandString, brand_string, 127);
+		strncpy(section_cper->BrandString, brand_string,
+			sizeof(section_cper->BrandString) - 1);
+		section_cper
+			->BrandString[sizeof(section_cper->BrandString) - 1] =
+			'\0';
 	}
 
 	//Write & flush out to file, free memory.
diff --git a/sections/cper-section-nvidia.c b/sections/cper-section-nvidia.c
index f0ccec6..e2f8aef 100644
--- a/sections/cper-section-nvidia.c
+++ b/sections/cper-section-nvidia.c
@@ -67,7 +67,8 @@
 	strncpy(section_cper->Signature,
 		json_object_get_string(
 			json_object_object_get(section, "signature")),
-		sizeof(section_cper->Signature));
+		sizeof(section_cper->Signature) - 1);
+	section_cper->Signature[sizeof(section_cper->Signature) - 1] = '\0';
 
 	//Fields.
 	section_cper->ErrorType = json_object_get_int(