claunia/libexeinfo
1
0
Fork 0
mirror of https://github.com/claunia/libexeinfo.git synced 2025-12-16 19:14:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle ELF notes with arrays.

Browse Source
This commit is contained in:
Natalia Portillo
2018-03-15 10:30:13 +00:00
parent 8644a36e40
commit 7c9d288fcb
1 changed files with 62 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
libexeinfo/ELF/ELF.cs
View File

@@ -155,10 +155,13 @@ namespace libexeinfo
interpreter = StringHandlers.CToString(buffer); interpreter = StringHandlers.CToString(buffer);
break; break;
case phType.PT_NOTE when buffer.Length > 12: case phType.PT_NOTE when buffer.Length > 12:
uint namesz = BitConverter.ToUInt32(buffer, 0); pos = 0;
uint descsz = BitConverter.ToUInt32(buffer, 4); while(pos < buffer.Length)
uint notetype = BitConverter.ToUInt32(buffer, 8); {
pos = 12; uint namesz = BitConverter.ToUInt32(buffer, pos + 0);
uint descsz = BitConverter.ToUInt32(buffer, pos + 4);
uint notetype = BitConverter.ToUInt32(buffer, pos + 8);
pos += 12;
if(IsBigEndian) if(IsBigEndian)
{ {
@@ -179,8 +182,12 @@ namespace libexeinfo
pos += pos % 4 != 0 ? 4 - pos % 4 : 0; pos += pos % 4 != 0 ? 4 - pos % 4 : 0;
Array.Copy(buffer, pos, note.contents, 0, descsz); Array.Copy(buffer, pos, note.contents, 0, descsz);
pos += (int)descsz;
pos += pos % 4 != 0 ? 4 - pos % 4 : 0;
RequiredOperatingSystem = GetOsByNote(note, interpreter, IsBigEndian); RequiredOperatingSystem = GetOsByNote(note, interpreter, IsBigEndian);
}
break; break;
} }
} }
@@ -418,10 +425,13 @@ namespace libexeinfo
} }
else if(sectionNames[i].StartsWith(".note") && buffer.Length > 12) else if(sectionNames[i].StartsWith(".note") && buffer.Length > 12)
{ {
uint namesz = BitConverter.ToUInt32(buffer, 0); pos = 0;
uint descsz = BitConverter.ToUInt32(buffer, 4); while(pos < buffer.Length)
uint notetype = BitConverter.ToUInt32(buffer, 8); {
pos = 12; uint namesz = BitConverter.ToUInt32(buffer, pos);
uint descsz = BitConverter.ToUInt32(buffer, pos + 4);
uint notetype = BitConverter.ToUInt32(buffer, pos + 8);
pos += 12;
if(IsBigEndian) if(IsBigEndian)
{ {
@@ -442,8 +452,13 @@ namespace libexeinfo
pos += pos % 4 != 0 ? 4 - pos % 4 : 0; pos += pos % 4 != 0 ? 4 - pos % 4 : 0;
Array.Copy(buffer, pos, note.contents, 0, descsz); Array.Copy(buffer, pos, note.contents, 0, descsz);
pos += (int)descsz;
pos += pos % 4 != 0 ? 4 - pos % 4 : 0;
notes.Add(sectionNames[i], note); string notename = note.type != 1 ? $"{sectionNames[i]}.{note.type}" : sectionNames[i];
if(!notes.ContainsKey(notename))
notes.Add(notename, note);
}
} }
} }