JS: avoid two uses of getChildExpr(0)

Esben Sparre Andreasen · Esben Sparre Andreasen · commit 3aae1d17dbcb · 2018-11-13T08:19:38.000+01:00
diff --git a/javascript/ql/src/semmle/javascript/DefensiveProgramming.qll b/javascript/ql/src/semmle/javascript/DefensiveProgramming.qll
@@ -239,10 +239,11 @@ module Internal {
       op.getRightOperand() = result
     )
     or
-    exists(IfStmt c |
-      c.getCondition() = guard |
-      result = c.getAControlledStmt().getChildExpr(0) or
-      result = c.getAControlledStmt().(BlockStmt).getStmt(0).getChildExpr(0)
+    exists(IfStmt c, ExprStmt guardedStmt |
+      c.getCondition() = guard and
+      result = guardedStmt.getExpr() |
+      guardedStmt = c.getAControlledStmt() or
+      guardedStmt = c.getAControlledStmt().(BlockStmt).getStmt(0)
     )
     or
     exists (ConditionalExpr c |
