mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 14:42:11 +02:00
Code Issues Wiki Activity

fixed elf parsing of 2G+ files

Browse source 
32 bit elf parser of 2G+ elf files does not read
some field properties because it does signed extension
when reading unsigned integer

Change-Id: I64b47cc0849d4fb41daec258b2a595003b9de734
This commit is contained in:
Alena Laskavaia 2016-05-09 15:35:38 -04:00
parent 3f660b725b
commit b08253b70a
2 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/ERandomAccessFile.java
View file

@ -56,10 +56,14 @@ public class ERandomAccessFile extends RandomAccessFile {
val[3] = read(); val[3] = read();
if ((val[0] | val[1] | val[2] | val[3]) < 0) if ((val[0] | val[1] | val[2] | val[3]) < 0)
throw new EOFException(); throw new EOFException();
long value;
if ( isle ) { if ( isle ) {
return ((val[3] << 24) + (val[2] << 16) + (val[1] << 8) + val[0]); value= ((val[3] << 24) + (val[2] << 16) + (val[1] << 8) + val[0]) ;
} else{
value= ((val[0] << 24) + (val[1] << 16) + (val[2] << 8) + val[3]);
} }
return ((val[0] << 24) + (val[1] << 16) + (val[2] << 8) + val[3]); return value & 0x00000000ffffffffL;
} }
public final long readLongE() throws IOException public final long readLongE() throws IOException

7
core/org.eclipse.cdt.core/utils/org/eclipse/cdt/utils/elf/parser/ElfParser.java
View file

@ -84,7 +84,12 @@ public class ElfParser extends AbstractCExtension implements IBinaryParser {
} }
} catch (IOException e) { } catch (IOException e) {
if (hints == null) { if (hints == null) {
binary = createBinaryArchive(path); try {
binary = createBinaryArchive(path);
} catch (IOException e2) {
CCorePlugin.log(e); // log original exception
throw e2;
}
} }
} }
} }