Bug 1913773 - Ensure mCurrentShmem is valid. r=aosmond

Differential Revision: https://phabricator.services.mozilla.com/D219832 UltraBlame original commit: b62942faef2f7106add3113546adef97a14e05b2
marco-c · Aug 23, 2024 · abcf33a · abcf33a
1 parent 68fd529
commit abcf33a
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 0 deletions.
diff --git a/gfx/layers/ipc/CanvasTranslator.cpp b/gfx/layers/ipc/CanvasTranslator.cpp
@@ -2019,6 +2019,13 @@ if
 (
 mCurrentShmem
 .
+IsValid
+(
+)
+&
+&
+mCurrentShmem
+.
 Size
 (
 )

diff --git a/gfx/layers/ipc/CanvasTranslator.h b/gfx/layers/ipc/CanvasTranslator.h
@@ -2442,18 +2442,34 @@ SharedMemory
 >
 shmem
 ;
+bool
+IsValid
+(
+)
+const
+{
+return
+!
+!
+shmem
+;
+}
 auto
 Size
 (
 )
 {
 return
 shmem
+?
+shmem
 -
 >
 Size
 (
 )
+:
+0
 ;
 }
 gfx
@@ -2464,6 +2480,19 @@ CreateMemReader
 (
 )
 {
+if
+(
+!
+shmem
+)
+{
+return
+{
+nullptr
+0
+}
+;
+}
 return
 {
 static_cast