[vlc-commits] commit: pulse: no need to check null in free (Ilkka Ollakka )

git at videolan.org git at videolan.org
Fri Dec 3 17:24:39 CET 2010


vlc/vlc-1.1 | branch: master | Ilkka Ollakka <ileoo at videolan.org> | Tue Jun  8 08:37:50 2010 +0300| [29a1f25235e2d9075f5ffe8e31cac4441bc0dab4] | committer: Jean-Baptiste Kempf 

pulse: no need to check null in free
(cherry picked from commit 5e969105d58499aed4dbf59c0bb45ded5cdbb072)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=29a1f25235e2d9075f5ffe8e31cac4441bc0dab4
---

 modules/audio_output/pulse.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
index d7c4165..d101231 100644
--- a/modules/audio_output/pulse.c
+++ b/modules/audio_output/pulse.c
@@ -307,8 +307,7 @@ unlock_and_fail:
     if (p_sys->mainloop)
         pa_threaded_mainloop_unlock(p_sys->mainloop);
 fail:
-    if (p_client_name)
-        free(p_client_name);
+    free(p_client_name);
     msg_Dbg(p_aout, "Pulse initialization failed");
     uninit(p_aout);
     return VLC_EGENERIC;



More information about the vlc-commits mailing list