For b/8315591, b/20141439 correct off-by-one error that resulted in last byte of...

diff --git a/README.google b/README.google
index fc0d0613817b99f0d965249dffe2eebb6943a41f..9937af55923b580227fd2e743bb0ac5d1d698a34 100644 (file)
--- a/README.google
+++ b/README.google
@@ -433,3 +433,8 @@ stdio-common/vfscanf.c
 socket/sys/un.h
   Replace null dereference in the SUN_LEN macro with offsetof.
   (nlewycky, not yet upstream)
+
+elf/dl-load.c
+  For b/8315591, b/20141439 correct off-by-one error that resulted in last
+  byte of l_name being random garbage.
+  (ppluzhnikov, google-local)

diff --git a/elf/dl-load.c b/elf/dl-load.c
index f7e8bb3077d56d1b7ba588993167c2af62ddc23a..3850f6e64b3c32feb0de3542dd93620aef892c7b 100644 (file)
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -1082,7 +1082,7 @@ _dl_map_object_from_fd (const char *name, int fd, off_t offset,
 
       char tmp[20];
       tmp[19] = '\0';
-      strcat(realname, _itoa(offset, &tmp[18], 16, 0));
+      strcat(realname, _itoa(offset, &tmp[19], 16, 0));
     }
 #endif