mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Fixed NPE.

Browse source
This commit is contained in:
Sergey Prigogin 2011-10-24 14:16:32 -07:00
parent a83da09772
commit ce2c732090
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/org.eclipse.cdt.core/parser/org/eclipse/cdt/internal/core/dom/parser/SizeofCalculator.java
View file

@ -24,6 +24,7 @@ import org.eclipse.cdt.core.dom.ast.IEnumeration;
import org.eclipse.cdt.core.dom.ast.IField;
import org.eclipse.cdt.core.dom.ast.IPointerType;
import org.eclipse.cdt.core.dom.ast.IType;
import org.eclipse.cdt.core.dom.ast.IValue;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPBase;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPBasicType;
import org.eclipse.cdt.core.dom.ast.cpp.ICPPClassType;
@ -180,7 +181,10 @@ public class SizeofCalculator {
}
private SizeAndAlignment sizeAndAlignment(IArrayType type) {
Long numElements = type.getSize().numericalValue();
IValue value = type.getSize();
if (value == null)
return null;
Long numElements = value.numericalValue();
if (numElements == null)
return null;
IType elementType = type.getType();
@ -194,7 +198,7 @@ public class SizeofCalculator {
private SizeAndAlignment sizeAndAlignment(ICompositeType type) {
/* TODO(sprigogin): May produce incorrect result for structures containing bit fields.
* Unfortunately widths of bit fields is not preserved in the AST. */
* Unfortunately widths of bit fields are not preserved in the AST. */
long size = 0;
int maxAlignment = 1;
IField[] fields;