wip

Author: emesare

objectivec/objc.cpp

@@ -1509,12 +1509,22 @@ void ObjCProcessor::ProcessCFStrings(std::optional<std::string> imageName)
 					uint8_t* rawData = static_cast<uint8_t*>(data.GetData());
 					uint8_t* offsetAddress = rawData + bufferOff;
 					uint16_t c = *reinterpret_cast<uint16_t*>(offsetAddress);
-					if (c == 0x20)
+					if (c == 0x20) {
 						str.push_back('_');
-					else if (c < 0x80)
+					} else if (c == '\r') {
+						str.push_back('\\');
+						str.push_back('r');
+					} else if (c == '\n') {
+						str.push_back('\\');
+						str.push_back('n');
+					} else if (c == '\t') {
+						str.push_back('\\');
+						str.push_back('t');
+					} else if (c > 0x20 && c < 0x80) {
 						str.push_back(c);
-					else
+					} else {
 						str.push_back('?');
+					}
 				}
 				DefineObjCSymbol(
 					DataSymbol, Type::ArrayType(Type::WideCharType(2), size + 1), "ustr_" + str, strLoc, true);
@@ -1524,11 +1534,26 @@ void ObjCProcessor::ProcessCFStrings(std::optional<std::string> imageName)
 			else  // UTF8 / ASCII
 			{
 				reader->Seek(strLoc);
-				str = reader->ReadCString();
-				for (auto& c : str)
+				std::string rawStr = reader->ReadCString(size + 1);
+				str = "";
+				for (signed char c : rawStr)
 				{
-					if (c == ' ')
-						c = '_';
+					if (c == 0x20) {
+						str.push_back('_');
+					} else if (c == '\r') {
+						str.push_back('\\');
+						str.push_back('r');
+					} else if (c == '\n') {
+						str.push_back('\\');
+						str.push_back('n');
+					} else if (c == '\t') {
+						str.push_back('\\');
+						str.push_back('t');
+					} else if (c > 0x20 || c < 0) {
+						str.push_back(c);
+					} else {
+						str.push_back('?');
+					}
 				}
 				DefineObjCSymbol(DataSymbol, Type::ArrayType(Type::IntegerType(1, true), str.size() + 1), "cstr_" + str,
 					strLoc, true);

objectivec/objc.h

@@ -166,7 +166,7 @@ namespace BinaryNinja {
 		    \throws Exception
 			\return the string
 		*/
-		virtual std::string ReadCString() = 0;
+		virtual std::string ReadCString(size_t maxLength = -1) = 0;
 
 		/*! Read a uint8_t from the current cursor position and advance the cursor by 1 byte
 

view/macho/objc.cpp

@@ -11,9 +11,9 @@ void MachoObjCReader::Read(void* dest, size_t len)
 	m_reader.Read(dest, len);
 }
 
-std::string MachoObjCReader::ReadCString()
+std::string MachoObjCReader::ReadCString(size_t maxLength)
 {
-	return m_reader.ReadCString();
+	return m_reader.ReadCString(maxLength);
 }
 
 uint8_t MachoObjCReader::Read8()

view/macho/objc.h

@@ -10,7 +10,7 @@ namespace BinaryNinja {
 
 	public:
 		void Read(void* dest, size_t len) override;
-		std::string ReadCString() override;
+		std::string ReadCString(size_t maxLength = -1) override;
 		uint8_t Read8() override;
 		uint16_t Read16() override;
 		uint32_t Read32() override;

view/sharedcache/core/MappedFileAccessor.cpp

@@ -17,12 +17,13 @@ void MappedFileAccessor::WritePointer(size_t address, size_t pointer)
     *reinterpret_cast<size_t *>(&m_file._mmap[address]) = pointer;
 }
 
-std::string MappedFileAccessor::ReadNullTermString(size_t address) const
+std::string MappedFileAccessor::ReadNullTermString(size_t address, size_t maxLength) const
 {
     if (address > Length())
         return "";
     auto start = m_file._mmap + address;
-    auto end = m_file._mmap + m_file.len;
+    auto endLen = (maxLength > 0) ? maxLength : m_file.len;
+    auto end = start + endLen;
     auto nul = std::find(start, end, 0);
     return {start, nul};
 }

view/sharedcache/core/MappedFileAccessor.h

@@ -51,7 +51,7 @@ class MappedFileAccessor : public std::enable_shared_from_this<MappedFileAccesso
 	 */
 	void WritePointer(size_t address, size_t pointer);
 
-    std::string ReadNullTermString(size_t address) const;
+    std::string ReadNullTermString(size_t address, size_t maxLength = -1) const;
 
     uint8_t ReadUInt8(size_t address);
 

view/sharedcache/core/ObjC.cpp

@@ -14,9 +14,9 @@ void SharedCacheObjCReader::Read(void* dest, size_t len)
 	m_reader.Read(dest, len);
 }
 
-std::string SharedCacheObjCReader::ReadCString()
+std::string SharedCacheObjCReader::ReadCString(size_t maxLength)
 {
-	return m_reader.ReadCString(m_reader.GetOffset());
+	return m_reader.ReadCString(m_reader.GetOffset(), maxLength);
 }
 
 uint8_t SharedCacheObjCReader::Read8()

view/sharedcache/core/ObjC.h

@@ -22,7 +22,7 @@ namespace DSCObjC {
 
 	public:
 		void Read(void* dest, size_t len) override;
-		std::string ReadCString() override;
+		std::string ReadCString(size_t maxLength = -1) override;
 		uint8_t Read8() override;
 		uint16_t Read16() override;
 		uint32_t Read32() override;

view/sharedcache/core/VirtualMemory.cpp

@@ -151,9 +151,10 @@ VirtualMemoryReader::VirtualMemoryReader(std::shared_ptr<VirtualMemory> memory,
 {
     m_memory = memory;
     m_addressSize = addressSize;
+    m_cursor = 0;
 }
 
-std::string VirtualMemoryReader::ReadCString(uint64_t address)
+std::string VirtualMemoryReader::ReadCString(uint64_t address, size_t maxLength)
 {
     uint64_t offset;
     auto region = m_memory->GetRegionAtAddress(address, offset);

view/sharedcache/core/VirtualMemory.h

@@ -89,7 +89,7 @@ class VirtualMemoryReader
 
 	size_t GetOffset() const { return m_cursor; }
 
-	std::string ReadCString(uint64_t address);
+	std::string ReadCString(uint64_t address, size_t maxLength = -1);
 
 	uint64_t ReadULEB128(size_t cursorLimit);