From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id DF78246CDD for ; Sun, 8 Oct 2023 01:36:35 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3AB2768CA05; Sun, 8 Oct 2023 04:36:33 +0300 (EEST) Received: from mail-qv1-f50.google.com (mail-qv1-f50.google.com [209.85.219.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 510D768C83C for ; Sun, 8 Oct 2023 04:36:27 +0300 (EEST) Received: by mail-qv1-f50.google.com with SMTP id 6a1803df08f44-66afd39c833so2434476d6.0 for ; Sat, 07 Oct 2023 18:36:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696728986; x=1697333786; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Ri3VzHgO98AxuV5Pt4B5hawNpaYOYREILHqorgCLpAM=; b=SE0eq/bq4M9IFePJKmSFWkVdVC2Xct2Z4DWQFEcj9TxPZmS/dq4JK+k3RfGeLyyNDU qicLMBbXc7V48SXVafIuNWHI/B0TFNlzi9tuSSKoPL8WDa6OdKsRI3N/UTPbKsWMhSXf Tqmr/zfkn8WDrs66NgC/vA/KZLgQvVNIqMfm42n0TIWkhSYUdVeX8tU+i336H8fV2byx 8QRytAHfZYI+BKstcvX8k+C/qGuhNeA5ppblU68SU3RH9K5MPt5igQLvk2YufkgiPj8t SoZZeiCJ6wzKjurwQUUihJTeltcnku6B2jRVzix0GffBvbC/n7MWjHtJf6GG3dpXo/oR 9c7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696728986; x=1697333786; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Ri3VzHgO98AxuV5Pt4B5hawNpaYOYREILHqorgCLpAM=; b=b01TiBg73Gta/GUq/aM2dqaKt85BKTYe69cYV0bofNDgdPveJzLGvec7ApV8kPmTB2 rZwB0LvLYxFThdtEGXrs8p8Qk0oipdqFZp4+QbQFEJIZQsIAPJVkM8MtjztfCWFUZW9f eXh65P1iV83cw/pMCdzph00s68i73AJ3XdbWfgSsWQw77VW35BqX4JXquMBPJyzWeYVB QjCrKrvVuRNxlG5u2K324gqvoSKNL4/chLqTBRVmvAtnnKY7KbseHc7rLi0kspc5XncH 88zUssL7MF6RoO1JIf3gUBN5Rhdm3fastmkCIOxn3oerhAc7Ndh1W8wC6k0iwluCzpzF NI1g== X-Gm-Message-State: AOJu0YxtapH6dhzeOauHy8UfdyoZljms0MxJnHTWlQq7tLKZh0eX1K0p 77GST6SdBFwPdVhRJq+4HG9EgQkcaqGgeg== X-Google-Smtp-Source: AGHT+IGRrccPGchZQk718s5I8aWssqKmMIHNybdSB5LYEfZl7TmE2r4mQ4G1WwwyMVQVuYP1Vqxi2w== X-Received: by 2002:a05:6214:e62:b0:65a:fd40:24d8 with SMTP id jz2-20020a0562140e6200b0065afd4024d8mr13081036qvb.4.1696728985809; Sat, 07 Oct 2023 18:36:25 -0700 (PDT) Received: from gauss.local (c-68-56-149-176.hsd1.mi.comcast.net. [68.56.149.176]) by smtp.gmail.com with ESMTPSA id g6-20020a0cf086000000b006581e82a628sm2642319qvk.134.2023.10.07.18.36.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Oct 2023 18:36:25 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 Oct 2023 21:36:23 -0400 Message-ID: <20231008013623.292217-1-leo.izen@gmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/librsvgdec: fix memory leaks and deprecated functions X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Leo Izen Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: At various points through the function librsvg_decode_frame, errors are returned from immediately without deallocating any allocated structs. This patch both fixes those leaks, and also fixes the use of functions that are deprecated since librsvg version 2.52.0. The older calls are still used, guarded by #ifdefs while the newer replacements are used if librsvg >= 2.52.0. One of the deprecated functions is used as a check for the configure shell script, so it was replaced with a different function. Signed-off-by: Leo Izen --- configure | 2 +- libavcodec/librsvgdec.c | 81 +++++++++++++++++++++++++++++++---------- 2 files changed, 63 insertions(+), 20 deletions(-) diff --git a/configure b/configure index 8a1a1b8584..25d251b389 100755 --- a/configure +++ b/configure @@ -6777,7 +6777,7 @@ enabled libpulse && require_pkg_config libpulse libpulse pulse/pulseaud enabled librabbitmq && require_pkg_config librabbitmq "librabbitmq >= 0.7.1" amqp.h amqp_new_connection enabled librav1e && require_pkg_config librav1e "rav1e >= 0.5.0" rav1e.h rav1e_context_new enabled librist && require_pkg_config librist "librist >= 0.2.7" librist/librist.h rist_receiver_create -enabled librsvg && require_pkg_config librsvg librsvg-2.0 librsvg-2.0/librsvg/rsvg.h rsvg_handle_render_cairo +enabled librsvg && require_pkg_config librsvg librsvg-2.0 librsvg-2.0/librsvg/rsvg.h rsvg_handle_new_from_data enabled librtmp && require_pkg_config librtmp librtmp librtmp/rtmp.h RTMP_Socket enabled librubberband && require_pkg_config librubberband "rubberband >= 1.8.1" rubberband/rubberband-c.h rubberband_new -lstdc++ && append librubberband_extralibs "-lstdc++" enabled libshaderc && require_pkg_config spirv_compiler "shaderc >= 2019.1" shaderc/shaderc.h shaderc_compiler_initialize diff --git a/libavcodec/librsvgdec.c b/libavcodec/librsvgdec.c index 2f160edcdf..c328fbc774 100644 --- a/libavcodec/librsvgdec.c +++ b/libavcodec/librsvgdec.c @@ -38,48 +38,75 @@ static int librsvg_decode_frame(AVCodecContext *avctx, AVFrame *frame, { int ret; LibRSVGContext *s = avctx->priv_data; - - RsvgHandle *handle; - RsvgDimensionData unscaled_dimensions, dimensions; - cairo_surface_t *image; + RsvgHandle *handle = NULL; + RsvgDimensionData dimensions; +#if LIBRSVG_MAJOR_VERSION > 2 || LIBRSVG_MAJOR_VERSION == 2 && LIBRSVG_MINOR_VERSION >= 52 + RsvgRectangle viewport = { 0 }; +#else + RsvgDimensionData unscaled_dimensions; +#endif + cairo_surface_t *image = NULL; cairo_t *crender = NULL; GError *error = NULL; + gboolean gret; *got_frame = 0; handle = rsvg_handle_new_from_data(pkt->data, pkt->size, &error); if (error) { - av_log(avctx, AV_LOG_ERROR, "Error parsing svg!\n"); - g_error_free(error); - return AVERROR_INVALIDDATA; + av_log(avctx, AV_LOG_ERROR, "Error parsing svg: %s\n", error->message); + ret = AVERROR_INVALIDDATA; + goto end; } +#if LIBRSVG_MAJOR_VERSION > 2 || LIBRSVG_MAJOR_VERSION == 2 && LIBRSVG_MINOR_VERSION >= 52 + gret = rsvg_handle_get_intrinsic_size_in_pixels(handle, &viewport.width, &viewport.height); + if (!gret) { + viewport.width = s->width ? s->width : 100; + viewport.height = s->height ? s->height : 100; + } + dimensions.width = (int)viewport.width; + dimensions.height = (int)viewport.height; +#else rsvg_handle_get_dimensions(handle, &dimensions); rsvg_handle_get_dimensions(handle, &unscaled_dimensions); +#endif dimensions.width = s->width ? s->width : dimensions.width; dimensions.height = s->height ? s->height : dimensions.height; if (s->keep_ar && (s->width || s->height)) { +#if LIBRSVG_MAJOR_VERSION > 2 || LIBRSVG_MAJOR_VERSION == 2 && LIBRSVG_MINOR_VERSION >= 52 + double default_ar = viewport.width / viewport.height; +#else double default_ar = unscaled_dimensions.width/(double)unscaled_dimensions.height; +#endif if (!s->width) dimensions.width = lrintf(dimensions.height * default_ar); else dimensions.height = lrintf(dimensions.width / default_ar); } - if ((ret = ff_set_dimensions(avctx, dimensions.width, dimensions.height))) - return ret; + ret = ff_set_dimensions(avctx, dimensions.width, dimensions.height); + if (ret < 0) + goto end; + avctx->pix_fmt = AV_PIX_FMT_RGB32; + viewport.width = dimensions.width; + viewport.height = dimensions.height; + + ret = ff_get_buffer(avctx, frame, 0); + if (ret < 0) + goto end; - if ((ret = ff_get_buffer(avctx, frame, 0))) - return ret; frame->pict_type = AV_PICTURE_TYPE_I; frame->flags |= AV_FRAME_FLAG_KEY; image = cairo_image_surface_create_for_data(frame->data[0], CAIRO_FORMAT_ARGB32, frame->width, frame->height, frame->linesize[0]); - if (cairo_surface_status(image) != CAIRO_STATUS_SUCCESS) - return AVERROR_INVALIDDATA; + if (cairo_surface_status(image) != CAIRO_STATUS_SUCCESS) { + ret = AVERROR_EXTERNAL; + goto end; + } crender = cairo_create(image); @@ -88,18 +115,34 @@ static int librsvg_decode_frame(AVCodecContext *avctx, AVFrame *frame, cairo_paint(crender); cairo_restore(crender); +#if LIBRSVG_MAJOR_VERSION > 2 || LIBRSVG_MAJOR_VERSION == 2 && LIBRSVG_MINOR_VERSION >= 52 + gret = rsvg_handle_render_document(handle, crender, &viewport, &error); +#else cairo_scale(crender, dimensions.width / (double)unscaled_dimensions.width, dimensions.height / (double)unscaled_dimensions.height); + gret = rsvg_handle_render_cairo(handle, crender); +#endif - rsvg_handle_render_cairo(handle, crender); - - cairo_destroy(crender); - cairo_surface_destroy(image); - g_object_unref(handle); + if (!gret) { + av_log(avctx, AV_LOG_ERROR, "Error rendering svg: %s\n", error ? error->message : "unknown error"); + ret = AVERROR_EXTERNAL; + goto end; + } *got_frame = 1; + ret = 0; - return 0; +end: + if (error) + g_error_free(error); + if (handle) + g_object_unref(handle); + if (crender) + cairo_destroy(crender); + if (image) + cairo_surface_destroy(image); + + return ret; } #define OFFSET(x) offsetof(LibRSVGContext, x) -- 2.42.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".