Changeset 18665 in josm for trunk/src/org/openstreetmap/josm/gui/datatransfer/importers/FilePaster.java

Timestamp:

2023-02-16T16:01:49+01:00 (20 months ago)

Author:

taylor.smock

Message:

Fix several coverity issues

CID-1504572: Synchronization on java.util.concurrent objects

The lock wasn't necessary after moving from AtomicBoolean to
CountDownLatch

CID-1504570: Dereference null value -- the default getApiUrl return was null
CID-1504570: Explicit null dereferenced

Consumer<IOAuthToken> to Consumer<Optional<IOAuthToken>>

CID-1476014, CID-1476013, CID-1476011: Resource leak

These resource leaks are unlikely to happen outside of plugin code,
and are all related to StringSelection#getTransferData, which may
return a Closeable object, but is unlikely to be the Transferable
for any of the affected classes.

This also fixes some recently introduced SonarLint issues. It also suppresses
squid:S100 ("Method names should comply with a naming convention") for the MapCSS
Functions class, since the convention for that method names in that class is
^[a-zA-Z][a-zA-Z0-9_]*$

File:

• trunk/src/org/openstreetmap/josm/gui/datatransfer/importers/FilePaster.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/datatransfer/importers/FilePaster.java

@@ -4 +4 @@
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.UnsupportedFlavorException;
+import java.io.Closeable;
 import java.io.File;
 import java.io.IOException;
@@ -15 +16 @@
 import org.openstreetmap.josm.gui.io.importexport.Options;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -32 +34 @@
     public boolean importData(TransferSupport support, OsmDataLayer layer, EastNorth pasteAt)
             throws UnsupportedFlavorException, IOException {
-        @SuppressWarnings("unchecked")
-        List<File> files = (List<File>) support.getTransferable().getTransferData(df);
-        OpenFileAction.OpenFileTask task = new OpenFileAction.OpenFileTask(files, null);
-        task.setOptions(Options.RECORD_HISTORY);
-        MainApplication.worker.submit(task);
-        return true;
+        final Object data = support.getTransferable().getTransferData(df);
+        if (data instanceof List) {
+            @SuppressWarnings("unchecked")
+            List<File> files = (List<File>) data;
+            OpenFileAction.OpenFileTask task = new OpenFileAction.OpenFileTask(files, null);
+            task.setOptions(Options.RECORD_HISTORY);
+            MainApplication.worker.submit(task);
+            return true;
+        }
+        // We should never hit this code -- Coverity thinks that it is possible for this to be called with a
+        // StringSelection transferable, which is not currently possible with our code. It *could* be done from
+        // a plugin though.
+        if (data instanceof Closeable) {
+            Utils.close((Closeable) data);
+        }
+        throw new UnsupportedFlavorException(df);
     }
 }