---

yaml --- r: 336658 b: refs/heads/master c: 47abd13 h: refs/heads/master v: v3
git-mirror · Nov 14, 2012 · 9ca9b9c · 9ca9b9c
1 parent c3d429c
commit 9ca9b9c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 97171c6be3088a68b403c7285d34c151f7dbfb18
+refs/heads/master: 47abd13ccfa140ad34620b343bf0e6eca15ed8e8
diff --git a/trunk/drivers/acpi/acpica/nsutils.c b/trunk/drivers/acpi/acpica/nsutils.c
@@ -557,8 +557,11 @@ acpi_ns_externalize_name(u32 internal_name_length,
 				(*converted_name)[j++] = '.';
 			}
 
-			ACPI_MOVE_NAME(*converted_name, internal_name);
-			acpi_ut_repair_name(*converted_name);
+			/* Copy and validate the 4-char name segment */
+
+			ACPI_MOVE_NAME(&(*converted_name)[j],
+				       &internal_name[names_index]);
+			acpi_ut_repair_name(&(*converted_name)[j]);
 
 			j += ACPI_NAME_SIZE;
 			names_index += ACPI_NAME_SIZE;