From e7b519503cf90f8742fef690ad375bec8e399094 Mon Sep 17 00:00:00 2001 From: Grant Paul Date: Fri, 2 Sep 2016 22:59:40 -0700 Subject: [PATCH] Fix minor issues revealed by static analysis. --- LICENSE | 2 -- Libraries/libbom/Sources/bom.c | 1 + Libraries/libcar/Sources/Rendition.cpp | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index eaea2cc5..96f81fde 100644 --- a/LICENSE +++ b/LICENSE @@ -120,7 +120,6 @@ POSSIBILITY OF SUCH DAMAGE. ## osxbom - Initial code Author: Joseph Coffland Date: October, 2011 @@ -136,7 +135,6 @@ This program is in the public domain. ## ThemeEngine - Copyright (c) 2014, Alex Zielenski All rights reserved. diff --git a/Libraries/libbom/Sources/bom.c b/Libraries/libbom/Sources/bom.c index ef803ed2..ca9eca80 100755 --- a/Libraries/libbom/Sources/bom.c +++ b/Libraries/libbom/Sources/bom.c @@ -350,6 +350,7 @@ bom_variable_iterate(struct bom_context *context, bom_variable_iterator iterator strncpy(var_name, var->name, var->length); var_name[var->length] = 0; if (!iterator(context, var_name, ntohl(var->index), ctx)) { + free(var_name); break; } free(var_name); diff --git a/Libraries/libcar/Sources/Rendition.cpp b/Libraries/libcar/Sources/Rendition.cpp index ca42d2bd..59731f0c 100644 --- a/Libraries/libcar/Sources/Rendition.cpp +++ b/Libraries/libcar/Sources/Rendition.cpp @@ -291,7 +291,6 @@ Decode(struct car_rendition_value *value) } else if (value->pixel_format == car_rendition_value_pixel_format_jpeg) { format = Rendition::Data::Format::JPEG; } else { - format = Rendition::Data::Format::Data; fprintf(stderr, "error: unsupported pixel format %.4s\n", (char const *)&value->pixel_format); return ext::nullopt; } @@ -632,6 +631,7 @@ write() const memcpy(output_bytes, info_slices, info_slices_size); output_bytes += info_slices_size; + free(info_slices); memcpy(output_bytes, &info_metrics, sizeof(struct car_rendition_info_metrics)); output_bytes += sizeof(struct car_rendition_info_metrics);