Changeset 10189 in josm for trunk/src

Timestamp:

2016-05-11T16:38:03+02:00 (8 years ago)

Author:

Don-vip

Message:

fix coverity 1355210 - UR: Uninitialized read of field in constructor

Location:

trunk/src/org/openstreetmap/josm/gui/oauth

Files:

• AbstractAuthorizationUI.java (modified) (2 diffs)
• ManualAuthorizationUI.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/oauth/AbstractAuthorizationUI.java

@@ -22 +22 @@
 
     private String apiUrl;
-    private final AdvancedOAuthPropertiesPanel pnlAdvancedProperties;
+    private final AdvancedOAuthPropertiesPanel pnlAdvancedProperties = new AdvancedOAuthPropertiesPanel();
     private transient OAuthToken accessToken;
 
-    protected void fireAccessTokenChanged(OAuthToken oldValue, OAuthToken newValue) {
-        firePropertyChange(ACCESS_TOKEN_PROP, oldValue, newValue);
+    /**
+     * Constructs a new {@code AbstractAuthorizationUI} without API URL.
+     * @since 10189
+     */
+    public AbstractAuthorizationUI() {
     }
 
@@ -35 +38 @@
      */
     public AbstractAuthorizationUI(String apiUrl) {
-        pnlAdvancedProperties = new AdvancedOAuthPropertiesPanel();
         setApiUrl(apiUrl);
+    }
+
+    protected void fireAccessTokenChanged(OAuthToken oldValue, OAuthToken newValue) {
+        firePropertyChange(ACCESS_TOKEN_PROP, oldValue, newValue);
     }
 

trunk/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java

@@ -55 +55 @@
      */
     public ManualAuthorizationUI(String apiUrl, Executor executor) {
-        super(apiUrl);
+        super(/* dont pass apiURL because setApiUrl is overriden and references a local field */);
+        setApiUrl(apiUrl);
         this.executor = executor;
         build();