Bug 1542829 - Backport an upstream libpng patch. r=aosmond a=pascalc
authorRyan VanderMeulen <ryanvm@gmail.com>
Mon, 08 Apr 2019 19:00:31 +0000
changeset 526105 e52e74683afcfd9434253927cc54c9081b28a187
parent 526104 8842c0d0cef24b7eff3550daed701ae33cb6ec7d
child 526106 590d0706d113fca9c085f866f3c7ea29955cc8e2
push id2032
push userffxbld-merge
push dateMon, 13 May 2019 09:36:57 +0000
treeherdermozilla-release@455c1065dcbe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaosmond, pascalc
bugs1542829
milestone67.0
Bug 1542829 - Backport an upstream libpng patch. r=aosmond a=pascalc Differential Revision: https://phabricator.services.mozilla.com/D26575
media/libpng/png.c
--- a/media/libpng/png.c
+++ b/media/libpng/png.c
@@ -4593,18 +4593,17 @@ png_image_free(png_imagep image)
 {
    /* Safely call the real function, but only if doing so is safe at this point
     * (if not inside an error handling context).  Otherwise assume
     * png_safe_execute will call this API after the return.
     */
    if (image != NULL && image->opaque != NULL &&
       image->opaque->error_buf == NULL)
    {
-      /* Ignore errors here: */
-      (void)png_safe_execute(image, png_image_free_function, image);
+      png_image_free_function(image);
       image->opaque = NULL;
    }
 }
 
 int /* PRIVATE */
 png_image_error(png_imagep image, png_const_charp error_message)
 {
    /* Utility to log an error. */