You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by so...@apache.org on 2015/06/16 05:19:45 UTC
[5/5] trafficserver git commit: TS-3282: Fix NULL check after
dereference CID# 1306624
TS-3282: Fix NULL check after dereference CID# 1306624
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/5174c55d
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/5174c55d
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/5174c55d
Branch: refs/heads/master
Commit: 5174c55d0091d313faeadb4c1e6ec9d86beeac6e
Parents: 10e462e
Author: Phil Sorber <so...@apache.org>
Authored: Mon Jun 15 21:16:53 2015 -0600
Committer: Phil Sorber <so...@apache.org>
Committed: Mon Jun 15 21:18:46 2015 -0600
----------------------------------------------------------------------
plugins/experimental/mp4/mp4_meta.cc | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5174c55d/plugins/experimental/mp4/mp4_meta.cc
----------------------------------------------------------------------
diff --git a/plugins/experimental/mp4/mp4_meta.cc b/plugins/experimental/mp4/mp4_meta.cc
index 3b119e7..51044cd 100644
--- a/plugins/experimental/mp4/mp4_meta.cc
+++ b/plugins/experimental/mp4/mp4_meta.cc
@@ -1173,13 +1173,11 @@ Mp4Meta::mp4_update_ctts_atom(Mp4Trak *trak)
trak->ctts_atom.reader = NULL;
}
- if (trak->ctts_data.reader) {
- TSIOBufferReaderFree(trak->ctts_data.reader);
- TSIOBufferDestroy(trak->ctts_data.buffer);
+ TSIOBufferReaderFree(trak->ctts_data.reader);
+ TSIOBufferDestroy(trak->ctts_data.buffer);
- trak->ctts_data.reader = NULL;
- trak->ctts_data.buffer = NULL;
- }
+ trak->ctts_data.reader = NULL;
+ trak->ctts_data.buffer = NULL;
TSIOBufferReaderFree(readerp);
return 0;