Merge remote-tracking branch 'sdefresne/master'

LLFKHL · Mar 12, 2019 · 1f15e74 · 1f15e74
2 parents 58d6825 + 48c261b
commit 1f15e74
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Source/CDLCSegment.m b/Source/CDLCSegment.m
@@ -61,7 +61,8 @@ - (id)initWithDataCursor:(CDMachOFileDataCursor *)cursor;
         _segmentCommand.cmdsize = [cursor readInt32];
 
         _name = [cursor readStringOfLength:16 encoding:NSASCIIStringEncoding];
-        memcpy(_segmentCommand.segname, [_name UTF8String], sizeof(_segmentCommand.segname));
+        size_t nameLength = [_name lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
+        memcpy(_segmentCommand.segname, [_name UTF8String], MIN(sizeof(_segmentCommand.segname), nameLength));
         _segmentCommand.vmaddr   = [cursor readPtr];
         _segmentCommand.vmsize   = [cursor readPtr];
         _segmentCommand.fileoff  = [cursor readPtr];

diff --git a/Source/CDSection.m b/Source/CDSection.m
@@ -23,9 +23,11 @@ - (id)initWithDataCursor:(CDMachOFileDataCursor *)cursor segment:(CDLCSegment *)
         _segment = segment;
 
         _sectionName = [cursor readStringOfLength:16 encoding:NSASCIIStringEncoding];
-        memcpy(_section.sectname, [_sectionName UTF8String], sizeof(_section.sectname));
+        size_t sectionNameLength = [_sectionName lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
+        memcpy(_section.sectname, [_sectionName UTF8String], MIN(sectionNameLength, sizeof(_section.sectname)));
+        size_t segmentNameLength = [_sectionName lengthOfBytesUsingEncoding:NSUTF8StringEncoding];
         _segmentName = [cursor readStringOfLength:16 encoding:NSASCIIStringEncoding];
-        memcpy(_section.segname, [_segmentName UTF8String], sizeof(_section.segname));
+        memcpy(_section.segname, [_segmentName UTF8String], MIN(segmentNameLength, sizeof(_section.segname)));
         _section.addr      = [cursor readPtr];
         _section.size      = [cursor readPtr];
         _section.offset    = [cursor readInt32];