avoid double free with old libav

git-svn-id: https://xpra.org/svn/Xpra/trunk@4124 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Aug 9, 2013 · 068fdfb · 068fdfb
1 parent 44a5adf
commit 068fdfb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/debian/patches/old-libav.patch b/debian/patches/old-libav.patch
@@ -28,7 +28,7 @@ Index: xpra/codecs/dec_avcodec/decoder.pyx
          if self.frame!=NULL:
 -            avcodec_free_frame(&self.frame)
 -            #redundant: self.frame = NULL
-+            free(&self.frame)
++            #free(&self.frame)   #freeing here causes a double free on Ubuntu, avcodec_close probably does it too
 +            self.frame = NULL
 
          cdef unsigned long ctx_key          #@DuplicatedSignature

diff --git a/src/patches/old-libav.patch b/src/patches/old-libav.patch
@@ -28,7 +28,7 @@ Index: xpra/codecs/dec_avcodec/decoder.pyx
          if self.frame!=NULL:
 -            avcodec_free_frame(&self.frame)
 -            #redundant: self.frame = NULL
-+            free(&self.frame)
++            #free(&self.frame)   #freeing here causes a double free on Ubuntu, avcodec_close probably does it too
 +            self.frame = NULL
 
          cdef unsigned long ctx_key          #@DuplicatedSignature