summaryrefslogtreecommitdiffstats
path: root/gtk
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2008-09-08 00:24:11 +0000
committerjstebbins <[email protected]>2008-09-08 00:24:11 +0000
commitee19debd964cbd40df6097f34be0076162700550 (patch)
treeca17cbdbaf7a1076e251528196bfc0b610611a83 /gtk
parent6ade707e8ed615708c3eaa5a0d282c3936fe825a (diff)
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://svn.handbrake.fr/HandBrake/trunk@1676 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'gtk')
-rw-r--r--gtk/src/callbacks.c1
-rw-r--r--gtk/src/main.c1
-rw-r--r--gtk/src/plist.c2
3 files changed, 3 insertions, 1 deletions
diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index b185d4af4..453fa693a 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 6cf76ae1c..02012b9bd 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 93178b370..b0a39c31b 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);