[vlc-commits] Revert "access: live555: fix mem leaks (cid #1346966, #1346965, #1346964)"

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jan  2 21:27:07 2016 +0200| [8c5a7eee3834c8ae22553e7d8bf767da64e8f42f] | committer: Rémi Denis-Courmont

Revert "access: live555: fix mem leaks (cid #1346966, #1346965, #1346964)"

This reverts commit 6e1c08a211f681d9d122f019491747d3c01cc30c.
There are no leaks. All pointers must be NULL in the involved case.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8c5a7eee3834c8ae22553e7d8bf767da64e8f42f
---

 modules/access/live555.cpp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp
index 97a35af..efd66f3 100644
--- a/modules/access/live555.cpp
+++ b/modules/access/live555.cpp
@@ -1069,8 +1069,9 @@ static int SessionsSetup( demux_t *p_demux )
                        {
                          memcpy( ((char*)tk->fmt.p_extra)+i_extra1+i_extra2, p_extra3, i_extra3 );
                        }
+
+                        delete[] p_extra1; delete[] p_extra2; delete[] p_extra3;
                     }
-                    delete[] p_extra1; delete[] p_extra2; delete[] p_extra3;
                 }
 #endif
                 else if( !strcmp( sub->codecName(), "JPEG" ) )