You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by bo...@apache.org on 2015/05/06 19:18:01 UTC
cordova-plugin-camera git commit: CB-8253 Fix potential unreleased
resources
Repository: cordova-plugin-camera
Updated Branches:
refs/heads/master c2e0db2b8 -> b0ee9dd90
CB-8253 Fix potential unreleased resources
There was a place (~line 701) in CameraLauncher.java where there was the
potential for input and output streams to never be closed if an exception
occurs at the wrong time. There were some other places where an
InputStream was used anonymously, and so would never be closed.
This change introduces try/finally blocks to ensure that the streams will
always end up closed.
Change-Id: I479bceddcd631bfec45c3f5ee7e88ddb04c59073
Signed-off-by: Joe Bowser <bo...@apache.org>
(Closes #90)
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/b0ee9dd9
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/b0ee9dd9
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/b0ee9dd9
Branch: refs/heads/master
Commit: b0ee9dd90514a8e714e817f1f93d0834bf314d2a
Parents: c2e0db2
Author: Alan Kinzie <al...@sap.com>
Authored: Wed Jan 7 13:59:22 2015 -0500
Committer: Joe Bowser <bo...@apache.org>
Committed: Wed May 6 10:17:43 2015 -0700
----------------------------------------------------------------------
src/android/CameraLauncher.java | 80 ++++++++++++++++++++++++++++++------
1 file changed, 68 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/b0ee9dd9/src/android/CameraLauncher.java
----------------------------------------------------------------------
diff --git a/src/android/CameraLauncher.java b/src/android/CameraLauncher.java
index b5e59d2..c9584a3 100644
--- a/src/android/CameraLauncher.java
+++ b/src/android/CameraLauncher.java
@@ -24,6 +24,7 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.OutputStream;
import java.net.URI;
import java.text.SimpleDateFormat;
@@ -761,16 +762,33 @@ private String ouputModifiedBitmap(Bitmap bitmap, Uri uri) throws IOException {
*/
private void writeUncompressedImage(Uri uri) throws FileNotFoundException,
IOException {
- FileInputStream fis = new FileInputStream(FileHelper.stripFileProtocol(imageUri.toString()));
- OutputStream os = this.cordova.getActivity().getContentResolver().openOutputStream(uri);
- byte[] buffer = new byte[4096];
- int len;
- while ((len = fis.read(buffer)) != -1) {
- os.write(buffer, 0, len);
+ FileInputStream fis = null;
+ OutputStream os = null;
+ try {
+ fis = new FileInputStream(FileHelper.stripFileProtocol(imageUri.toString()));
+ os = this.cordova.getActivity().getContentResolver().openOutputStream(uri);
+ byte[] buffer = new byte[4096];
+ int len;
+ while ((len = fis.read(buffer)) != -1) {
+ os.write(buffer, 0, len);
+ }
+ os.flush();
+ } finally {
+ if (os != null) {
+ try {
+ os.close();
+ } catch (IOException e) {
+ LOG.d(LOG_TAG,"Exception while closing output stream.");
+ }
+ }
+ if (fis != null) {
+ try {
+ fis.close();
+ } catch (IOException e) {
+ LOG.d(LOG_TAG,"Exception while closing file input stream.");
+ }
+ }
}
- os.flush();
- os.close();
- fis.close();
}
/**
@@ -806,13 +824,39 @@ private String ouputModifiedBitmap(Bitmap bitmap, Uri uri) throws IOException {
private Bitmap getScaledBitmap(String imageUrl) throws IOException {
// If no new width or height were specified return the original bitmap
if (this.targetWidth <= 0 && this.targetHeight <= 0) {
- return BitmapFactory.decodeStream(FileHelper.getInputStreamFromUriString(imageUrl, cordova));
+ InputStream fileStream = null;
+ Bitmap image = null;
+ try {
+ fileStream = FileHelper.getInputStreamFromUriString(imageUrl, cordova);
+ image = BitmapFactory.decodeStream(fileStream);
+ } finally {
+ if (fileStream != null) {
+ try {
+ fileStream.close();
+ } catch (IOException e) {
+ LOG.d(LOG_TAG,"Exception while closing file input stream.");
+ }
+ }
+ }
+ return image;
}
// figure out the original width and height of the image
BitmapFactory.Options options = new BitmapFactory.Options();
options.inJustDecodeBounds = true;
- BitmapFactory.decodeStream(FileHelper.getInputStreamFromUriString(imageUrl, cordova), null, options);
+ InputStream fileStream = null;
+ try {
+ fileStream = FileHelper.getInputStreamFromUriString(imageUrl, cordova);
+ BitmapFactory.decodeStream(fileStream, null, options);
+ } finally {
+ if (fileStream != null) {
+ try {
+ fileStream.close();
+ } catch (IOException e) {
+ LOG.d(LOG_TAG,"Exception while closing file input stream.");
+ }
+ }
+ }
//CB-2292: WTF? Why is the width null?
if(options.outWidth == 0 || options.outHeight == 0)
@@ -826,7 +870,19 @@ private String ouputModifiedBitmap(Bitmap bitmap, Uri uri) throws IOException {
// Load in the smallest bitmap possible that is closest to the size we want
options.inJustDecodeBounds = false;
options.inSampleSize = calculateSampleSize(options.outWidth, options.outHeight, this.targetWidth, this.targetHeight);
- Bitmap unscaledBitmap = BitmapFactory.decodeStream(FileHelper.getInputStreamFromUriString(imageUrl, cordova), null, options);
+ Bitmap unscaledBitmap = null;
+ try {
+ fileStream = FileHelper.getInputStreamFromUriString(imageUrl, cordova);
+ unscaledBitmap = BitmapFactory.decodeStream(fileStream, null, options);
+ } finally {
+ if (fileStream != null) {
+ try {
+ fileStream.close();
+ } catch (IOException e) {
+ LOG.d(LOG_TAG,"Exception while closing file input stream.");
+ }
+ }
+ }
if (unscaledBitmap == null) {
return null;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org