Skip to content

Commit 9c3ebe6

Browse files
committed
[GR-19326] Fix potential NPE in REnvVars
1 parent 9bd74c7 commit 9c3ebe6

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/access/vector/CachedExtractVectorNode.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -308,6 +308,8 @@ private void applyDimensions(RAbstractContainer originalTarget, RAbstractVector
308308
}
309309
newDimNames[dimIndex] = result;
310310
if (newDimNamesNames != null) {
311+
// (newDimNamesNames == null) <=> (originalDimNamesNames == null)
312+
assert originalDimNamesNames != null;
311313
newDimNamesNames[dimIndex] = originalDimNamesNames.getDataAt(i);
312314
}
313315
}

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/REnvVars.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public RContext.ContextState initialize(RContext context) {
126126
}
127127
}
128128
TruffleFile userFile = userFilePath != null ? FileSystemUtils.getSafeTruffleFile(env, userFilePath) : null;
129-
if (userFile.exists()) {
129+
if (userFile != null && userFile.exists()) {
130130
safeReadEnvironFile(userFile);
131131
}
132132
}

0 commit comments

Comments
 (0)