kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-03 19:16:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

rtp_engine.c: Must protect mime_types_len with mime_types_lock.

Browse Source 
Change-Id: I44220dd369cc151ebf5281d5119d84bb9e54d54e
This commit is contained in:
Richard Mudgett
2015-07-29 13:48:12 -05:00
parent 741fa0d26d
commit 1519eb44a7
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
main/rtp_engine.c
View File

@@ -603,6 +603,7 @@ void ast_rtp_codecs_payloads_destroy(struct ast_rtp_codecs *codecs)
void ast_rtp_codecs_payloads_clear(struct ast_rtp_codecs *codecs, struct ast_rtp_instance *instance) void ast_rtp_codecs_payloads_clear(struct ast_rtp_codecs *codecs, struct ast_rtp_instance *instance)
{ {
ast_rtp_codecs_payloads_destroy(codecs); ast_rtp_codecs_payloads_destroy(codecs);
ast_rtp_codecs_payloads_initialize(codecs);
if (instance && instance->engine && instance->engine->payload_set) { if (instance && instance->engine && instance->engine->payload_set) {
int i; int i;
@@ -610,8 +611,6 @@ void ast_rtp_codecs_payloads_clear(struct ast_rtp_codecs *codecs, struct ast_rtp
instance->engine->payload_set(instance, i, 0, NULL, 0); instance->engine->payload_set(instance, i, 0, NULL, 0);
} }
} }
ast_rtp_codecs_payloads_initialize(codecs);
} }
void ast_rtp_codecs_payloads_copy(struct ast_rtp_codecs *src, struct ast_rtp_codecs *dest, struct ast_rtp_instance *instance) void ast_rtp_codecs_payloads_copy(struct ast_rtp_codecs *src, struct ast_rtp_codecs *dest, struct ast_rtp_instance *instance)
@@ -1716,12 +1715,16 @@ static void rtp_engine_mime_type_cleanup(int i)
static void set_next_mime_type(struct ast_format *format, int rtp_code, const char *type, const char *subtype, unsigned int sample_rate) static void set_next_mime_type(struct ast_format *format, int rtp_code, const char *type, const char *subtype, unsigned int sample_rate)
{ {
int x = mime_types_len; int x;
if (ARRAY_LEN(ast_rtp_mime_types) == mime_types_len) {
ast_rwlock_wrlock(&mime_types_lock);
x = mime_types_len;
if (ARRAY_LEN(ast_rtp_mime_types) <= x) {
ast_rwlock_unlock(&mime_types_lock);
return; return;
} }
ast_rwlock_wrlock(&mime_types_lock);
/* Make sure any previous value in ast_rtp_mime_types is cleaned up */ /* Make sure any previous value in ast_rtp_mime_types is cleaned up */
memset(&ast_rtp_mime_types[x], 0, sizeof(struct ast_rtp_mime_type)); memset(&ast_rtp_mime_types[x], 0, sizeof(struct ast_rtp_mime_type));
if (format) { if (format) {
@@ -1734,6 +1737,7 @@ static void set_next_mime_type(struct ast_format *format, int rtp_code, const ch
ast_copy_string(ast_rtp_mime_types[x].subtype, subtype, sizeof(ast_rtp_mime_types[x].subtype)); ast_copy_string(ast_rtp_mime_types[x].subtype, subtype, sizeof(ast_rtp_mime_types[x].subtype));
ast_rtp_mime_types[x].sample_rate = sample_rate; ast_rtp_mime_types[x].sample_rate = sample_rate;
mime_types_len++; mime_types_len++;
ast_rwlock_unlock(&mime_types_lock); ast_rwlock_unlock(&mime_types_lock);
} }
@@ -2095,6 +2099,7 @@ static void rtp_engine_shutdown(void)
rtp_engine_mime_type_cleanup(x); rtp_engine_mime_type_cleanup(x);
} }
} }
mime_types_len = 0;
ast_rwlock_unlock(&mime_types_lock); ast_rwlock_unlock(&mime_types_lock);
} }