kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix incorrect sizeof() usage in features.c.

Browse Source 
This didn't actually result in a bug anywhere, luckily.  The only place
where the result of these memcpys was used is in app_dial, and the only
field that it read out of ast_call_feature was the first one, which is an
int, so these memcpys always copied just enough to avoid a problem.
........

Merged revisions 359069 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 359072 from http://svn.asterisk.org/svn/asterisk/branches/10


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@359075 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2012-03-14 00:22:10 +00:00
parent 1b3cbdacd7
commit 9410f85699
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main/features.c
View File

@@ -3176,7 +3176,7 @@ static int feature_interpret_helper(struct ast_channel *chan, struct ast_channel
res = builtin_features[x].operation(chan, peer, config, code, sense, NULL);
}
if (feature) {
memcpy(feature, &builtin_features[x], sizeof(feature));
memcpy(feature, &builtin_features[x], sizeof(*feature));
}
feature_detected = 1;
break;
@@ -3206,7 +3206,7 @@ static int feature_interpret_helper(struct ast_channel *chan, struct ast_channel
if (operation) {
res = fge->feature->operation(chan, peer, config, code, sense, fge->feature);
}
memcpy(feature, fge->feature, sizeof(feature));
memcpy(feature, fge->feature, sizeof(*feature));
if (res != AST_FEATURE_RETURN_KEEPTRYING) {
AST_RWLIST_UNLOCK(&feature_groups);
break;
@@ -3239,7 +3239,7 @@ static int feature_interpret_helper(struct ast_channel *chan, struct ast_channel
res = tmpfeature->operation(chan, peer, config, code, sense, tmpfeature);
}
if (feature) {
memcpy(feature, tmpfeature, sizeof(feature));
memcpy(feature, tmpfeature, sizeof(*feature));
}
if (res != AST_FEATURE_RETURN_KEEPTRYING) {
AST_RWLIST_UNLOCK(&feature_list);