Changeset 7681a9b5d1df0cbcaa5914cc33bb40fee8276a36

Timestamp:

01/05/07 17:46:13 (1 year ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1178034373 +0000

git-parent:

[fd2c85f56b67d2ad436d67ada15ed0e8d4073578]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1178034373 +0000

Message:

Fix some memleaks

Files:

• include/vlc_sout.h (modified) (1 diff)
• modules/stream_out/standard.c (modified) (2 diffs)
• src/stream_output/announce.c (modified) (3 diffs)
• src/stream_output/stream_output.h (modified) (1 diff)

include/vlc_sout.h

@@ -216 +216 @@
-
-VLC_EXPORT(session_descriptor_t*,sout_AnnounceSessionCreate, (vlc_object_t *obj, const char *cfgpref) );
-har *, char *, int,
+onst char *, const char *, int, const
-VLC_EXPORT(void,                 sout_AnnounceSessionDestroy, (session_descriptor_t *) );
-VLC_EXPORT(announce_method_t*,   sout_SAPMethod, (void) );

modules/stream_out/standard.c

@@ -391 +391 @@
-            msg_Err (p_access, "SAP announces not supported for access %s",
-                     psz_access);
-            free (fmt);
-            free (src);
-            free (dst);
-            goto nosap;
-        }
@@ -404 +401 @@
-        p_stream->p_sys->p_session = p_session;
-        sout_MethodRelease (p_method);
-
+
-nosap:
+        free (fmt);
+        free (src);
+        free (dst);
+    }
-
-    p_stream->pf_add    = Add;

src/stream_output/announce.c

@@ -194 +194 @@
-
-int sout_SessionSetMedia (vlc_object_t *obj, session_descriptor_t *p_session,
-
-
-
-
+
+
+
+
+
-
-    /* GRUIK. We should not convert back-and-forth from string to numbers */
@@ -203 +204 @@
-    if (vlc_getaddrinfo (obj, dst, dport, NULL, &res) == 0)
-    {
-
-
-
+
+
+
+
+
-        vlc_freeaddrinfo (res);
-    }
-    if (vlc_getaddrinfo (obj, src, sport, NULL, &res) == 0)
-    {
-
-
-
+
+
+
+
-        vlc_freeaddrinfo (res);
-    }
-    return 0;
+
+oflow:
+    vlc_freeaddrinfo (res);
+    return VLC_ENOMEM;
-}
-
@@ -232 +240 @@
-        free (p_session->psz_sdp);
-        free (p_session->description);
+        free (p_session->sdpformat);
-        free (p_session->url);
-        free (p_session->email);

src/stream_output/stream_output.h

@@ -22 +22 @@
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
-
+
+
-
-#include <vlc_sout.h>