Author: felixk
Date: Wed Nov 14 13:34:15 2007
New Revision: 595072
URL: http://svn.apache.org/viewvc?rev=595072&view=rev
Log:
Method may fail to close stream
The method creates an IO stream object, does not assign it to any fields, pass
it to other methods that might close it, or return it, and does not appear to
close the stream on all paths out of the method. This may result in a file
descriptor leak. It is generally a good idea to use a finally block to ensure
that streams are closed.
Modified:
directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/ASN1InputStream.java
directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/DERApplicationSpecific.java
directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/util/PropertiesUtils.java
Modified:
directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/ASN1InputStream.java
URL:
http://svn.apache.org/viewvc/directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/ASN1InputStream.java?rev=595072&r1=595071&r2=595072&view=diff
==============================================================================
---
directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/ASN1InputStream.java
(original)
+++
directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/ASN1InputStream.java
Wed Nov 14 13:34:15 2007
@@ -188,15 +188,22 @@
return new DERNull();
case DERObject.SEQUENCE | DERObject.CONSTRUCTED:
ASN1InputStream ais = new ASN1InputStream( bytes );
-
+ DEREncodable obj = null;
DERSequence sequence = new DERSequence();
- DEREncodable obj = ais.readObject();
-
- while ( obj != null )
+ try
{
- sequence.add( obj );
obj = ais.readObject();
+
+ while ( obj != null )
+ {
+ sequence.add( obj );
+ obj = ais.readObject();
+ }
+ }
+ finally
+ {
+ ais.close();
}
return sequence;
@@ -204,12 +211,19 @@
ais = new ASN1InputStream( bytes );
DERSet set = new DERSet();
- obj = ais.readObject();
-
- while ( obj != null )
+ try
{
- set.add( obj );
obj = ais.readObject();
+
+ while ( obj != null )
+ {
+ set.add( obj );
+ obj = ais.readObject();
+ }
+ }
+ finally
+ {
+ ais.close();
}
return set;
@@ -292,25 +306,32 @@
ais = new ASN1InputStream( bytes );
- DEREncodable encodable = ais.readObject();
-
- // Explicitly tagged - if it isn't we'd have to tell from
- // the context.
- if ( ais.available() == 0 )
+ try
{
- return new DERTaggedObject( true, tagNo, encodable,
bytes );
- }
-
- // Another implicit object, create a sequence.
- DERSequence derSequence = new DERSequence();
+ DEREncodable encodable = ais.readObject();
+
+ // Explicitly tagged - if it isn't we'd have to tell from
+ // the context.
+ if ( ais.available() == 0 )
+ {
+ return new DERTaggedObject( true, tagNo,
encodable, bytes );
+ }
+
+ // Another implicit object, create a sequence.
+ DERSequence derSequence = new DERSequence();
+
+ while ( encodable != null )
+ {
+ derSequence.add( encodable );
+ encodable = ais.readObject();
+ }
- while ( encodable != null )
+ return new DERTaggedObject( false, tagNo, derSequence
);
+ }
+ finally
{
- derSequence.add( encodable );
- encodable = ais.readObject();
+ ais.close();
}
-
- return new DERTaggedObject( false, tagNo, derSequence );
}
return new DERUnknownTag( tag, bytes );
Modified:
directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/DERApplicationSpecific.java
URL:
http://svn.apache.org/viewvc/directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/DERApplicationSpecific.java?rev=595072&r1=595071&r2=595072&view=diff
==============================================================================
---
directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/DERApplicationSpecific.java
(original)
+++
directory/shared/branches/bigbang/asn1/src/main/java/org/apache/directory/shared/asn1/der/DERApplicationSpecific.java
Wed Nov 14 13:34:15 2007
@@ -68,8 +68,16 @@
public DEREncodable getObject() throws IOException
- {
- return new ASN1InputStream( getOctets() ).readObject();
+ {
+ final ASN1InputStream ais = new ASN1InputStream( getOctets() );
+ try
+ {
+ return ais.readObject();
+ }
+ finally
+ {
+ ais.close();
+ }
}
Modified:
directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/util/PropertiesUtils.java
URL:
http://svn.apache.org/viewvc/directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/util/PropertiesUtils.java?rev=595072&r1=595071&r2=595072&view=diff
==============================================================================
---
directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/util/PropertiesUtils.java
(original)
+++
directory/shared/branches/bigbang/ldap/src/main/java/org/apache/directory/shared/ldap/util/PropertiesUtils.java
Wed Nov 14 13:34:15 2007
@@ -200,7 +200,15 @@
{
try
{
- properties.load( new FileInputStream( file ) );
+ final FileInputStream fis = new FileInputStream( file );
+ try
+ {
+ properties.load( fis );
+ }
+ finally
+ {
+ fis.close();
+ }
}
catch ( IOException e )
{
