From 88bbd0bcf8485d434704c72284f9d5e958b062c3 Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Thu, 24 Aug 2006 14:25:39 +0000 Subject: [PATCH] Remove a FIXME. Don't use strlcpy that isn't available on non-BSD platforms and ensure that a memory overrun won't occur while still writing Length bytes in the outstring function. llvm-svn: 29855 --- include/llvm/CodeGen/MachOWriter.h | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/include/llvm/CodeGen/MachOWriter.h b/include/llvm/CodeGen/MachOWriter.h index 61ca8d736ab..36fc6169e78 100644 --- a/include/llvm/CodeGen/MachOWriter.h +++ b/include/llvm/CodeGen/MachOWriter.h @@ -575,17 +575,15 @@ namespace llvm { outxword(Output, X); } void outstring(DataBuffer &Output, std::string &S, unsigned Length) { - char *buffer = (char *)calloc(1, Length); - unsigned i; - // FIXME: it is unclear if mach-o requires null terminated strings, or - // if a string of 16 bytes with no null terminator is ok. If so, - // we should switch to strncpy. - strlcpy(buffer, S.c_str(), Length); + unsigned len_to_copy = S.length() < Length ? S.length() : Length; + unsigned len_to_fill = S.length() < Length ? Length-S.length() : 0; - for (i = 0; i < Length; ++i) - outbyte(Output, buffer[i]); + for (unsigned i = 0; i < len_to_copy; ++i) + outbyte(Output, S[i]); + + for (unsigned i = 0; i < len_to_fill; ++i) + outbyte(Output, 0); - free(buffer); } private: void EmitGlobal(GlobalVariable *GV);