diff options
author | Abhishek Koneru <akoneru@redhat.com> | 2012-06-21 09:44:15 -0400 |
---|---|---|
committer | Ade Lee <alee@redhat.com> | 2012-06-29 01:29:03 -0400 |
commit | eb4b46f25ca8dec8ac79c26cfb02e8918000c88e (patch) | |
tree | 22223edf9099ac1a3e0c3914d383c373a92950b0 /base/util/src/netscape/security/extensions | |
parent | 1eba8264adbe42115caac4db655d450a99791ceb (diff) | |
download | pki-eb4b46f25ca8dec8ac79c26cfb02e8918000c88e.tar.gz pki-eb4b46f25ca8dec8ac79c26cfb02e8918000c88e.tar.xz pki-eb4b46f25ca8dec8ac79c26cfb02e8918000c88e.zip |
Fixes for Forward Null Cases in Coverity for DogTag10
Addressed review coments.
Diffstat (limited to 'base/util/src/netscape/security/extensions')
-rw-r--r-- | base/util/src/netscape/security/extensions/GenericASN1Extension.java | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/base/util/src/netscape/security/extensions/GenericASN1Extension.java b/base/util/src/netscape/security/extensions/GenericASN1Extension.java index b51846498..43b2e0b2b 100644 --- a/base/util/src/netscape/security/extensions/GenericASN1Extension.java +++ b/base/util/src/netscape/security/extensions/GenericASN1Extension.java @@ -418,8 +418,9 @@ public class GenericASN1Extension extends Extension throw new IOException("File name is not provided."); } - FileInputStream fis = new FileInputStream(fname); + FileInputStream fis = null; try { + fis = new FileInputStream(fname); int n = 0; while ((n = fis.available()) > 0) { buff = new byte[n]; @@ -428,28 +429,30 @@ public class GenericASN1Extension extends Extension break; s = new String(buff); } - - for (i = 0, j = 0; j < s.length(); j++) { - int ch = s.charAt(j); - if (ch == 10 || ch == 13 || ch == 9) - continue; - i++; - } - buff = new byte[i]; - for (i = 0, j = 0; j < s.length(); j++) { - int ch = s.charAt(j); - if (ch == 10 || ch == 13 || ch == 9) - continue; - buff[i++] = (byte) ch; - } - - s = new String(buff); - - return s; } finally { if (fis != null) { fis.close(); } } + if (s == null) { + return ""; + } + for (i = 0, j = 0; j < s.length(); j++) { + int ch = s.charAt(j); + if (ch == 10 || ch == 13 || ch == 9) + continue; + i++; + } + buff = new byte[i]; + for (i = 0, j = 0; j < s.length(); j++) { + int ch = s.charAt(j); + if (ch == 10 || ch == 13 || ch == 9) + continue; + buff[i++] = (byte) ch; + } + s = new String(buff); + + return s; } + } |