1 files changed, 4 insertions, 2 deletions
diff --git a/lib/AST/Expr.cpp b/lib/AST/Expr.cpp
index cad6065e2e..90b8530339 100644
--- a/lib/AST/Expr.cpp
+++ b/lib/AST/Expr.cpp
@@ -1366,10 +1366,12 @@ Stmt::child_iterator VAArgExpr::child_end() {
 
 // InitListExpr
 Stmt::child_iterator InitListExpr::child_begin() {
-  return reinterpret_cast<Stmt**>(&InitExprs[0]);
+  return reinterpret_cast<Stmt**>(InitExprs.size() ? 
+                                  &InitExprs[0] : 0);
 }
 Stmt::child_iterator InitListExpr::child_end() {
-  return reinterpret_cast<Stmt**>(&InitExprs[getNumInits()-1]);
+  return reinterpret_cast<Stmt**>(InitExprs.size() ? 
+                                  &InitExprs[0] + InitExprs.size() : 0);
 }
 
 // ObjCStringLiteral