File 03219835991f44c7ecf4dcc6fa8066967561be7e.patch of Package libde265

File 03219835991f44c7ecf4dcc6fa8066967561be7e.patch of Package libde265 (Revision 10)

Currently displaying revision 10 , Show latest

From 03219835991f44c7ecf4dcc6fa8066967561be7e Mon Sep 17 00:00:00 2001
From: Victor Loh <vloh@fb.com>
Date: Mon, 5 May 2025 13:05:53 -0700
Subject: [PATCH] [libde265] Fix potential data race in image.cc

There could be potential data race causing s_next_image_ID to not be minting out
ID in monotonically increasing order. Before this fix, there was an TSAN failure
and with this fix, the TSAN failure is resolved.
---
 libde265/image.cc | 5 +++--
 libde265/image.h  | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libde265/image.cc b/libde265/image.cc
index fdc80fc2..6acd8c15 100644
--- a/libde265/image.cc
+++ b/libde265/image.cc
@@ -22,6 +22,8 @@
 #include "decctx.h"
 #include "en265.h"
 
+#inclue <atomic>
+
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
@@ -187,8 +189,6 @@ void de265_image::set_image_plane(int cIdx, uint8_t* mem, int stride, void *user
 }
 
 
-uint32_t de265_image::s_next_image_ID = 0;
-
 de265_image::de265_image()
 {
   ID = -1;
@@ -249,6 +249,7 @@ de265_error de265_image::alloc_image(int w,int h, enum de265_chroma c,
                 allocated to the requested size. Without the release, the old image-data
                 will not be freed. */
 
+  static std::atomic<uint32_t> s_next_image_ID(0);
   ID = s_next_image_ID++;
   removed_at_picture_id = std::numeric_limits<int32_t>::max();
 
diff --git a/libde265/image.h b/libde265/image.h
index 3779580c..78a79de2 100644
--- a/libde265/image.h
+++ b/libde265/image.h
@@ -344,7 +344,6 @@ struct de265_image {
 
 private:
   uint32_t ID;
-  static uint32_t s_next_image_ID;
 
   uint8_t* pixels[3];
   uint8_t  bpp_shift[3];  // 0 for 8 bit, 1 for 16 bit