Commit 5a571d32 authored by Martin Storsjö's avatar Martin Storsjö

rtpdec_h264: Remove useless memory corruption checks

Signed-off-by: 's avatarMartin Storsjö <martin@martin.st>
parent b7b7354c
...@@ -53,8 +53,6 @@ ...@@ -53,8 +53,6 @@
RTP/H264 specific private data. RTP/H264 specific private data.
*/ */
struct PayloadContext { struct PayloadContext {
unsigned long cookie; ///< sanity check, to make sure we get the pointer we're expecting.
//sdp setup parameters //sdp setup parameters
uint8_t profile_idc; ///< from the sdp setup parameters. uint8_t profile_idc; ///< from the sdp setup parameters.
uint8_t profile_iop; ///< from the sdp setup parameters. uint8_t profile_iop; ///< from the sdp setup parameters.
...@@ -65,9 +63,6 @@ struct PayloadContext { ...@@ -65,9 +63,6 @@ struct PayloadContext {
#endif #endif
}; };
#define MAGIC_COOKIE (0xdeadbeef) ///< Cookie for the extradata; to verify we are what we think we are, and that we haven't been freed.
#define DEAD_COOKIE (0xdeaddead) ///< Cookie for the extradata; once it is freed.
/* ---------------- private code */ /* ---------------- private code */
static int sdp_parse_fmtp_config_h264(AVStream * stream, static int sdp_parse_fmtp_config_h264(AVStream * stream,
PayloadContext * h264_data, PayloadContext * h264_data,
...@@ -187,7 +182,6 @@ static int h264_handle_packet(AVFormatContext *ctx, ...@@ -187,7 +182,6 @@ static int h264_handle_packet(AVFormatContext *ctx,
#ifdef DEBUG #ifdef DEBUG
assert(data); assert(data);
assert(data->cookie == MAGIC_COOKIE);
#endif #endif
assert(buf); assert(buf);
...@@ -331,15 +325,7 @@ static int h264_handle_packet(AVFormatContext *ctx, ...@@ -331,15 +325,7 @@ static int h264_handle_packet(AVFormatContext *ctx,
/* ---------------- public code */ /* ---------------- public code */
static PayloadContext *h264_new_context(void) static PayloadContext *h264_new_context(void)
{ {
PayloadContext *data = return av_mallocz(sizeof(PayloadContext) + FF_INPUT_BUFFER_PADDING_SIZE);
av_mallocz(sizeof(PayloadContext) +
FF_INPUT_BUFFER_PADDING_SIZE);
if (data) {
data->cookie = MAGIC_COOKIE;
}
return data;
} }
static void h264_free_context(PayloadContext *data) static void h264_free_context(PayloadContext *data)
...@@ -354,13 +340,6 @@ static void h264_free_context(PayloadContext *data) ...@@ -354,13 +340,6 @@ static void h264_free_context(PayloadContext *data)
} }
#endif #endif
assert(data);
assert(data->cookie == MAGIC_COOKIE);
// avoid stale pointers (assert)
data->cookie = DEAD_COOKIE;
// and clear out this...
av_free(data); av_free(data);
} }
...@@ -376,7 +355,6 @@ static int parse_h264_sdp_line(AVFormatContext *s, int st_index, ...@@ -376,7 +355,6 @@ static int parse_h264_sdp_line(AVFormatContext *s, int st_index,
stream = s->streams[st_index]; stream = s->streams[st_index];
codec = stream->codec; codec = stream->codec;
assert(h264_data->cookie == MAGIC_COOKIE);
if (av_strstart(p, "framesize:", &p)) { if (av_strstart(p, "framesize:", &p)) {
char buf1[50]; char buf1[50];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment