From aa299768662a9a133650087a5f8653593eca4347 Mon Sep 17 00:00:00 2001 From: jstebbins Date: Mon, 8 Sep 2008 00:24:11 +0000 Subject: [PATCH] LinGui: fix memory issues found by valgrind one uninitialized variable one missing free one malloc that's 1 byte too small git-svn-id: svn://localhost/HandBrake/trunk@1676 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- gtk/src/callbacks.c | 1 + gtk/src/main.c | 1 + gtk/src/plist.c | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c index b185d4af..453fa693 100644 --- a/gtk/src/callbacks.c +++ b/gtk/src/callbacks.c @@ -3864,6 +3864,7 @@ ghb_is_cd(GDrive *gd) device = g_drive_get_identifier(gd, G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE); halDrive = libhal_drive_from_device_file (hal_ctx, device); dtype = libhal_drive_get_type(halDrive); + libhal_drive_free(halDrive); g_free(device); return (dtype == LIBHAL_DRIVE_TYPE_CDROM); } diff --git a/gtk/src/main.c b/gtk/src/main.c index 6cf76ae1..02012b9b 100644 --- a/gtk/src/main.c +++ b/gtk/src/main.c @@ -513,6 +513,7 @@ main (int argc, char *argv[]) ud->queue = NULL; ud->current_job = NULL; ud->current_dvd_device = NULL; + ud->dont_clear_presets = FALSE; // Redirect stderr to the activity window IoRedirect(ud); // Enable events that alert us to media change events diff --git a/gtk/src/plist.c b/gtk/src/plist.c index 93178b37..b0a39c31 100644 --- a/gtk/src/plist.c +++ b/gtk/src/plist.c @@ -393,7 +393,7 @@ ghb_plist_parse_file(FILE *fd) fseek(fd, 0, SEEK_END); size = ftell(fd); fseek(fd, 0, SEEK_SET); - buffer = g_malloc(size); + buffer = g_malloc(size+1); size = fread(buffer, 1, size, fd); buffer[size] = 0; gval = ghb_plist_parse(buffer, (gssize)size); -- 2.11.0