diff options
| author | Russell Bryant <russell@russellbryant.com> | 2007-07-17 20:49:09 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2007-07-17 20:49:09 +0000 |
| commit | b5ff588044aae1b28fd7fd8b488ec91c684baf13 (patch) | |
| tree | 800990dbdc005447ca001a29a8d86e51833d3eca /channels/iax2-parser.h | |
| parent | 54bd38f1ce25c173b4e0a937c8e18e5df5c6bb0a (diff) | |
Merged revisions 75445 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r75445 | russell | 2007-07-17 15:48:21 -0500 (Tue, 17 Jul 2007) | 13 lines
Merged revisions 75444 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r75444 | russell | 2007-07-17 15:45:27 -0500 (Tue, 17 Jul 2007) | 5 lines
Ensure that when encoding the contents of an ast_frame into an iax_frame, that
the size of the destination buffer is known in the iax_frame so that code
won't write past the end of the allocated buffer when sending outgoing frames.
(ASA-2007-014)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75446 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels/iax2-parser.h')
| -rw-r--r-- | channels/iax2-parser.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/iax2-parser.h b/channels/iax2-parser.h index 076f7ca85..e40669d3d 100644 --- a/channels/iax2-parser.h +++ b/channels/iax2-parser.h @@ -126,7 +126,7 @@ struct iax_frame { /* Actual, isolated frame header */ struct ast_frame af; /*! Amount of space _allocated_ for data */ - size_t mallocd_datalen; + size_t afdatalen; unsigned char unused[AST_FRIENDLY_OFFSET]; unsigned char afdata[0]; /* Data for frame */ }; |