summaryrefslogtreecommitdiff
path: root/audio/gqmpeg
diff options
context:
space:
mode:
authorlukem <lukem@pkgsrc.org>2002-03-25 06:24:59 +0000
committerlukem <lukem@pkgsrc.org>2002-03-25 06:24:59 +0000
commit550ed9d642f0aa3bbc26fcf496a9c285d36c0227 (patch)
treee1b84d67668e666a2af1168bf1f03f760f88e156 /audio/gqmpeg
parent40fb300e82eb796faeb77a0c78f73f8a0d22f14d (diff)
downloadpkgsrc-550ed9d642f0aa3bbc26fcf496a9c285d36c0227.tar.gz
fix minor memory leak in ogg123_comment_set() introduced in previous
Diffstat (limited to 'audio/gqmpeg')
-rw-r--r--audio/gqmpeg/distinfo4
-rw-r--r--audio/gqmpeg/patches/patch-ac24
2 files changed, 15 insertions, 13 deletions
diff --git a/audio/gqmpeg/distinfo b/audio/gqmpeg/distinfo
index 517873bdf7e..b7c570c7896 100644
--- a/audio/gqmpeg/distinfo
+++ b/audio/gqmpeg/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2002/03/25 05:44:48 lukem Exp $
+$NetBSD: distinfo,v 1.17 2002/03/25 06:24:59 lukem Exp $
SHA1 (gqmpeg-0.15.0.tar.gz) = 110b1e55cb52b38216524c8c9d3ac2cc5835ea98
Size (gqmpeg-0.15.0.tar.gz) = 885429 bytes
SHA1 (patch-aa) = c006f7a0490bced6a80e30e3aced606fc6eef5ab
SHA1 (patch-ab) = b49b9fda51342dff25d097bbdaeee22657ea2dc6
-SHA1 (patch-ac) = 6721f376f1ebc27e8cf53a97e85c7ed80934b731
+SHA1 (patch-ac) = 64597146d33960b5e5911fc6dc5aa21df4b79ff7
diff --git a/audio/gqmpeg/patches/patch-ac b/audio/gqmpeg/patches/patch-ac
index e5c2595f114..edf3a78f27c 100644
--- a/audio/gqmpeg/patches/patch-ac
+++ b/audio/gqmpeg/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.8 2002/03/25 05:44:48 lukem Exp $
+$NetBSD: patch-ac,v 1.9 2002/03/25 06:25:01 lukem Exp $
--- src/io_ogg123.c.orig Sat Feb 23 04:39:13 2002
-+++ src/io_ogg123.c Mon Mar 25 16:32:41 2002
++++ src/io_ogg123.c Mon Mar 25 17:16:37 2002
@@ -47,6 +47,62 @@ static gint ogg123_child_pid = -1;
static int ogg123_pipe[2];
@@ -154,7 +154,7 @@ $NetBSD: patch-ac,v 1.8 2002/03/25 05:44:48 lukem Exp $
GList *work;
char buf[128];
- gchar *tmp;
-+ int argc;
++ int argc, i;
+ char **argv;
+ gint child_pid;
+ int child_pipe[2];
@@ -218,17 +218,19 @@ $NetBSD: patch-ac,v 1.8 2002/03/25 05:44:48 lukem Exp $
errlist = NULL;
while (fgets(buf, sizeof(buf), f) != NULL)
-@@ -302,7 +377,8 @@ gint ogg123_comment_set(const gchar *pat
+@@ -302,7 +377,10 @@ gint ogg123_comment_set(const gchar *pat
}
}
- pclose(f);
+ close(child_pipe[0]);
++ for (i = 4; i < argc; i += 2)
++ g_free(argv[i]);
+ g_free(argv);
if (errlist)
{
-@@ -472,30 +548,24 @@ static gint parse_time(const gchar *text
+@@ -472,30 +550,24 @@ static gint parse_time(const gchar *text
return (m * 60 + s);
}
@@ -271,7 +273,7 @@ $NetBSD: patch-ac,v 1.8 2002/03/25 05:44:48 lukem Exp $
}
/* we only update once per second */
-@@ -505,12 +575,14 @@ static void parse_bitrate(const gchar *t
+@@ -505,12 +577,14 @@ static void parse_bitrate(const gchar *t
module_playback_data_changed();
old_t = new_t;
}
@@ -286,7 +288,7 @@ $NetBSD: patch-ac,v 1.8 2002/03/25 05:44:48 lukem Exp $
if (strncmp(buffer, "Time: ", 6) == 0)
{
const gchar *ptr;
-@@ -527,7 +599,9 @@ static gint ogg123_input_parse(const gch
+@@ -527,7 +601,9 @@ static gint ogg123_input_parse(const gch
if (strlen(ptr) < 8) return FALSE;
seconds_remaining = parse_time(ptr);
frames_remaining = seconds_remaining;
@@ -297,7 +299,7 @@ $NetBSD: patch-ac,v 1.8 2002/03/25 05:44:48 lukem Exp $
}
else if (strncmp(buffer, "Bitstream is", 12) == 0)
{
-@@ -648,7 +722,6 @@ static void ogg123_input_read_reset(void
+@@ -648,7 +724,6 @@ static void ogg123_input_read_reset(void
static gint ogg123_child_run(SongData *sd, gint position)
{
@@ -305,7 +307,7 @@ $NetBSD: patch-ac,v 1.8 2002/03/25 05:44:48 lukem Exp $
char cmd_arguments[OGG123_MAX_COMMANDS][512];
char *cmd_ptr[OGG123_MAX_COMMANDS];
int cmd_cnt = 0;
-@@ -720,48 +793,11 @@ static gint ogg123_child_run(SongData *s
+@@ -720,48 +795,11 @@ static gint ogg123_child_run(SongData *s
cmd_ptr[cmd_cnt] = NULL;
cmd_cnt++;
@@ -357,7 +359,7 @@ $NetBSD: patch-ac,v 1.8 2002/03/25 05:44:48 lukem Exp $
ogg123_input_read_reset();
ogg123_control_read_id = gdk_input_add (ogg123_pipe[0], GDK_INPUT_READ, ogg123_input_read_cb, NULL);
-@@ -769,6 +805,7 @@ static gint ogg123_child_run(SongData *s
+@@ -769,6 +807,7 @@ static gint ogg123_child_run(SongData *s
return TRUE;
}
@@ -365,7 +367,7 @@ $NetBSD: patch-ac,v 1.8 2002/03/25 05:44:48 lukem Exp $
/*
*----------------------------------------------------------------------------
* module callback funcs
-@@ -793,7 +830,7 @@ static gint ogg123_data_set(SongData *sd
+@@ -793,7 +832,7 @@ static gint ogg123_data_set(SongData *sd
if (info)
{
sd->length = info->length;