Remove CallerContext from cache keys to prevent caller context leaks.

Reviewed By: oprisnik Differential Revision: D67636632 fbshipit-source-id: e9eef8cd88f2fd2ebd25097cec1dfbdf3683c0a7
facebook · Jan 31, 2025 · d14c122 · d14c122
1 parent 21a3f60
commit d14c122
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 6 deletions.
diff --git a/imagepipeline/src/main/java/com/facebook/imagepipeline/cache/BitmapMemoryCacheKey.kt b/imagepipeline/src/main/java/com/facebook/imagepipeline/cache/BitmapMemoryCacheKey.kt
@@ -25,8 +25,6 @@ data class BitmapMemoryCacheKey(
     val postprocessorName: String?,
 ) : CacheKey {
 
-  var callerContext: Any? = null
-
   private val hash: Int = run {
     var result = sourceString.hashCode()
     result = 31 * result + (resizeOptions?.hashCode() ?: 0)

diff --git a/imagepipeline/src/main/java/com/facebook/imagepipeline/cache/DefaultCacheKeyFactory.java b/imagepipeline/src/main/java/com/facebook/imagepipeline/cache/DefaultCacheKeyFactory.java
@@ -40,7 +40,6 @@ public CacheKey getBitmapCacheKey(ImageRequest request, @Nullable Object callerC
             request.getImageDecodeOptions(),
             null,
             null);
-    cacheKey.setCallerContext(callerContext);
     return cacheKey;
   }
 
@@ -65,7 +64,6 @@ public CacheKey getPostprocessedBitmapCacheKey(
             request.getImageDecodeOptions(),
             postprocessorCacheKey,
             postprocessorName);
-    cacheKey.setCallerContext(callerContext);
     return cacheKey;
   }
 

diff --git a/tools/stetho/src/main/java/com/facebook/imagepipeline/stetho/BaseFrescoStethoPlugin.kt b/tools/stetho/src/main/java/com/facebook/imagepipeline/stetho/BaseFrescoStethoPlugin.kt
@@ -187,12 +187,11 @@ abstract class BaseFrescoStethoPlugin() : DumperPlugin {
     val entryValue = checkNotNull(entry.value)
     writer.println(
         formatStrLocaleSafe(
-            "size: %7.2fkB (%4d x %4d) key: %s, %s, duration: %dms",
+            "size: %7.2fkB (%4d x %4d) key: %s, duration: %dms",
             entryValue.get().sizeInBytes / KB,
             entryValue.get().width,
             entryValue.get().height,
             entry.key,
-            checkNotNull(cacheKey.callerContext),
             RealtimeSinceBootClock.get().now() - cacheKey.inBitmapCacheSince))
   }