status-im/react-native
2
0
Fork 0
mirror of https://github.com/status-im/react-native.git synced 2025-02-27 08:30:34 +00:00
Code Issues Projects Releases Wiki Activity

Don't close reference to image in getSize

Browse Source 
Summary:
ImageLoader improperly closes both the image reference
(which is shared) and the DataSource (which is shared, and should only be
handled by BaseDataSubscriber when it is correct).

Reviewed By: plamenko

Differential Revision: D3441752

fbshipit-source-id: bfb3d0281cd9ae789cba4079978ef46d295ac8f5
This commit is contained in:
Ahmed El-Helw 2016-06-17 11:52:32 -07:00 committed by Facebook Github Bot 7
parent bf79352e4f
commit 99e2a67b39
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ReactAndroid/src/main/java/com/facebook/react/modules/image/ImageLoaderModule.java
View File

@ -11,9 +11,6 @@ package com.facebook.react.modules.image;
import android.net.Uri; import android.net.Uri;
import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.Callback;
import com.facebook.react.bridge.WritableMap;
import com.facebook.common.executors.CallerThreadExecutor; import com.facebook.common.executors.CallerThreadExecutor;
import com.facebook.common.references.CloseableReference; import com.facebook.common.references.CloseableReference;
import com.facebook.datasource.BaseDataSubscriber; import com.facebook.datasource.BaseDataSubscriber;
@ -23,10 +20,12 @@ import com.facebook.drawee.backends.pipeline.Fresco;
import com.facebook.imagepipeline.image.CloseableImage; import com.facebook.imagepipeline.image.CloseableImage;
import com.facebook.imagepipeline.request.ImageRequest; import com.facebook.imagepipeline.request.ImageRequest;
import com.facebook.imagepipeline.request.ImageRequestBuilder; import com.facebook.imagepipeline.request.ImageRequestBuilder;
import com.facebook.react.bridge.Arguments;
import com.facebook.react.bridge.Promise; import com.facebook.react.bridge.Promise;
import com.facebook.react.bridge.ReactApplicationContext; import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactContextBaseJavaModule; import com.facebook.react.bridge.ReactContextBaseJavaModule;
import com.facebook.react.bridge.ReactMethod; import com.facebook.react.bridge.ReactMethod;
import com.facebook.react.bridge.WritableMap;
public class ImageLoaderModule extends ReactContextBaseJavaModule { public class ImageLoaderModule extends ReactContextBaseJavaModule {
@ -83,27 +82,20 @@ public class ImageLoaderModule extends ReactContextBaseJavaModule {
sizes.putInt("width", image.getWidth()); sizes.putInt("width", image.getWidth());
sizes.putInt("height", image.getHeight()); sizes.putInt("height", image.getHeight());
image.close();
promise.resolve(sizes); promise.resolve(sizes);
} catch (Exception e) { } catch (Exception e) {
promise.reject(ERROR_GET_SIZE_FAILURE, e); promise.reject(ERROR_GET_SIZE_FAILURE, e);
} finally { } finally {
CloseableReference.closeSafely(ref); CloseableReference.closeSafely(ref);
dataSource.close();
} }
} else { } else {
dataSource.close();
promise.reject(ERROR_GET_SIZE_FAILURE); promise.reject(ERROR_GET_SIZE_FAILURE);
} }
} }
@Override @Override
protected void onFailureImpl(DataSource<CloseableReference<CloseableImage>> dataSource) { protected void onFailureImpl(DataSource<CloseableReference<CloseableImage>> dataSource) {
try {
promise.reject(ERROR_GET_SIZE_FAILURE, dataSource.getFailureCause()); promise.reject(ERROR_GET_SIZE_FAILURE, dataSource.getFailureCause());
} finally {
dataSource.close();
}
} }
}; };
dataSource.subscribe(dataSubscriber, CallerThreadExecutor.getInstance()); dataSource.subscribe(dataSubscriber, CallerThreadExecutor.getInstance());