[GR-14480] Issues identified by Fortify report.

PullRequest: graalpython/440

Author: timfel

graalpython/com.oracle.graal.python.tck/src/com/oracle/graal/python/tck/PythonProvider.java

@@ -318,7 +318,13 @@ private static Source createSource(String resourceName) throws IOException {
         int slashIndex = resourceName.lastIndexOf('/');
         String scriptName = slashIndex >= 0 ? resourceName.substring(slashIndex + 1) : resourceName;
         Reader in = new InputStreamReader(PythonProvider.class.getResourceAsStream(resourceName), "UTF-8");
-        return Source.newBuilder(ID, in, scriptName).build();
+        try {
+            return Source.newBuilder(ID, in, scriptName).build();
+        } finally {
+            if (in != null) {
+                in.close();
+            }
+        }
     }
 
     private abstract static class PResultVerifier implements ResultVerifier {

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BuiltinConstructors.java

@@ -1897,7 +1897,7 @@ private Object typeMetaclass(String name, PTuple bases, PDict namespace, PythonA
             boolean addDict = false;
             if (slots == null) {
                 // takes care of checking if we may_add_dict and adds it if needed
-                addDict = addDictIfNative(pythonClass);
+                addDictIfNative(pythonClass);
                 // TODO: tfel - also deal with weaklistoffset
             } else {
                 // have slots

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TimeModuleBuiltins.java

@@ -599,7 +599,6 @@ private String format(String format, PTuple date) {
                         break;
                 }
                 lastc = i + 1;
-                i++;
             }
             return s;
         }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/PySequenceArrayWrapperMR.java

@@ -335,7 +335,7 @@ Object doTuple(PTuple s, long idx, Object value,
 
         @Fallback
         Object doGeneric(Object sequence, Object idx, Object value) {
-            setItemNode().execute(sequence, idx, getToJavaNode().execute(value));
+            getSetItemNode().execute(sequence, idx, getToJavaNode().execute(value));
             return value;
         }
 
@@ -371,7 +371,7 @@ private SequenceStorageNodes.SetItemNode getSetByteItemNode() {
             return setByteItemNode;
         }
 
-        private LookupAndCallTernaryNode setItemNode() {
+        private LookupAndCallTernaryNode getSetItemNode() {
             if (setItemNode == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 setItemNode = insert(LookupAndCallTernaryNode.create(__SETITEM__));

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/code/PCode.java

@@ -43,7 +43,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 import com.oracle.graal.python.PythonLanguage;
@@ -52,16 +51,13 @@
 import com.oracle.graal.python.builtins.objects.type.LazyPythonClass;
 import com.oracle.graal.python.nodes.ModuleRootNode;
 import com.oracle.graal.python.nodes.PRootNode;
-import com.oracle.graal.python.nodes.argument.ReadIndexedArgumentNode;
 import com.oracle.graal.python.nodes.argument.ReadVarArgsNode;
 import com.oracle.graal.python.nodes.argument.ReadVarKeywordsNode;
 import com.oracle.graal.python.nodes.frame.FrameSlotIDs;
-import com.oracle.graal.python.nodes.frame.WriteIdentifierNode;
 import com.oracle.graal.python.nodes.function.FunctionRootNode;
 import com.oracle.graal.python.nodes.generator.GeneratorFunctionRootNode;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.RootCallTarget;
-import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.NodeUtil;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.SourceSection;
@@ -203,26 +199,6 @@ private static String extractName(RootNode rootNode) {
         return name;
     }
 
-    @TruffleBoundary
-    private static Set<String> getKeywordArgumentNames(List<ReadIndexedArgumentNode> readKeywordNodes) {
-        return extractArgumentNames(readKeywordNodes);
-    }
-
-    @TruffleBoundary
-    private static Set<String> extractArgumentNames(List<? extends ReadIndexedArgumentNode> readIndexedArgumentNodes) {
-        Set<String> argNames = new HashSet<>();
-        for (ReadIndexedArgumentNode node : readIndexedArgumentNodes) {
-            Node parent = node.getParent();
-            if (parent instanceof WriteIdentifierNode) {
-                Object identifier = ((WriteIdentifierNode) parent).getIdentifier();
-                if (identifier instanceof String) {
-                    argNames.add((String) identifier);
-                }
-            }
-        }
-        return argNames;
-    }
-
     private static int extractStackSize(RootNode rootNode) {
         return rootNode.getFrameDescriptor().getSize();
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ints/IntBuiltins.java

@@ -1821,7 +1821,7 @@ public PBytes fromPIntInt(PInt self, int byteCount, String byteorder, boolean si
                     // requested array is bigger then we obtained from BigInteger
                     byte[] resultBytes = new byte[byteCount];
                     System.arraycopy(bytes, 0, resultBytes, resultBytes.length - bytes.length, bytes.length);
-                    if (signed && signByte == -1) {
+                    if (signByte == -1) {
                         // add sign bytes
                         for (int i = 0; i < resultBytes.length - bytes.length; i++) {
                             resultBytes[i] = signByte;
@@ -1837,7 +1837,7 @@ public PBytes fromPIntInt(PInt self, int byteCount, String byteorder, boolean si
                 for (int i = 0; i < bytes.length; i++) {
                     resultBytes[i] = bytes[bytes.length - 1 - i];
                 }
-                if (byteCount > bytes.length && signed && signByte == -1) {
+                if (byteCount > bytes.length && signByte == -1) {
                     // add sign negative bytes
                     for (int i = bytes.length; i < resultBytes.length; i++) {
                         resultBytes[i] = signByte;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/zipimporter/PZipImporter.java

@@ -208,7 +208,11 @@ private String getCode(String filenameAndSuffix) {
 
             // reading the file should be done better?
             BufferedReader reader = new BufferedReader(new InputStreamReader(in));
-            StringBuilder code = new StringBuilder();
+            int size = (int) entry.getSize();
+            if (size < 0) {
+                size = (int) entry.getCompressedSize();
+            }
+            StringBuilder code = new StringBuilder(size < 16 ? 16 : size);
             String line;
             while ((line = reader.readLine()) != null) {
                 code.append(line);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/ApplyKeywordsNode.java

@@ -107,7 +107,7 @@ Object[] applyCached(Object callee, @SuppressWarnings("unused") Signature callee
                     throw raise(PythonBuiltinClassType.TypeError, "%s() got multiple values for argument '%s'", CreateArgumentsNode.getName(callee), name);
                 }
                 PArguments.setArgument(arguments, kwIdx, kwArg.getValue());
-            } else if (takesVarKwds) {
+            } else if (unusedKeywords != null) {
                 unusedKeywords[k++] = kwArg;
             } else {
                 additionalKwds++;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/argument/CreateArgumentsNode.java

@@ -244,7 +244,7 @@ private Object[] createAndCheckArguments(PythonObject callable, Object[] args_w,
             // the called node takes and collect the rest in the keywords.
             if (keywords.length > 0) {
                 // the node acts as a profile
-                applyKeywords(callable, signature, scope_w, keywords);
+                getApplyKeywordsNode(callable, signature, scope_w, keywords);
             }
 
             if (too_many_args) {
@@ -265,7 +265,7 @@ private Object[] createAndCheckArguments(PythonObject callable, Object[] args_w,
             return scope_w;
         }
 
-        private void applyKeywords(Object callable, Signature signature, Object[] scope_w, PKeyword[] keywords) {
+        private void getApplyKeywordsNode(Object callable, Signature signature, Object[] scope_w, PKeyword[] keywords) {
             if (applyKeywords == null) {
                 CompilerDirectives.transferToInterpreterAndInvalidate();
                 applyKeywords = insert(ApplyKeywordsNode.create());

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/builtins/ListNodes.java

@@ -241,7 +241,6 @@ public SequenceStorage execute(Object iterator) {
                         }
                         case Generic: {
                             Object[] elements = new Object[START_SIZE];
-                            array = elements;
                             while (true) {
                                 try {
                                     Object value = next.execute(iterator);