kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 10:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 247335 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r247335 | mmichelson | 2010-02-17 15:22:40 -0600 (Wed, 17 Feb 2010) | 20 lines
  
  Fix two problems in ast_str functions found while writing a unit test.
  
  1. The documentation for ast_str_set and ast_str_append state that
  the max_len parameter may be -1 in order to limit the size of the
  ast_str to its current allocated size. The problem was that the max_len
  parameter in all cases was a size_t, which is unsigned. Thus a -1 was
  interpreted as UINT_MAX instead of -1. Changing the max_len parameter
  to be ssize_t fixed this issue.
  
  2. Once issue 1 was fixed, there was an off-by-one error in the case
  where we attempted to write a string larger than the current allotted
  size to a string when -1 was passed as the max_len parameter. When trying
  to write more than the allotted size, the ast_str's __AST_STR_USED was
  set to 1 higher than it should have been. Thanks to Tilghman for quickly
  spotting the offending line of code.
  
  Oh, and the unit test that I referenced in the top line of this commit
  will be added to reviewboard shortly. Sit tight...
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@247338 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2010-02-17 21:35:29 +00:00
parent c81a6e8453
commit 3414f2d009
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/asterisk/strings.h
View File

@@ -640,7 +640,7 @@ enum {
* through calling one of the other functions or macros defined in this
* file.
*/
int __attribute__((format(printf, 4, 0))) __ast_str_helper(struct ast_str **buf, size_t max_len,
int __attribute__((format(printf, 4, 0))) __ast_str_helper(struct ast_str **buf, ssize_t max_len,
int append, const char *fmt, va_list ap);
/*!
@@ -662,7 +662,7 @@ int __attribute__((format(printf, 4, 0))) __ast_str_helper(struct ast_str **buf,
*/
AST_INLINE_API(
int __attribute__((format(printf, 3, 4))) ast_str_set(
struct ast_str **buf, size_t max_len, const char *fmt, ...),
struct ast_str **buf, ssize_t max_len, const char *fmt, ...),
{
int res;
va_list ap;
@@ -683,7 +683,7 @@ int __attribute__((format(printf, 3, 4))) ast_str_set(
*/
AST_INLINE_API(
int __attribute__((format(printf, 3, 4))) ast_str_append(
struct ast_str **buf, size_t max_len, const char *fmt, ...),
struct ast_str **buf, ssize_t max_len, const char *fmt, ...),
{
int res;
va_list ap;

4
main/utils.c
View File

@@ -1655,7 +1655,7 @@ int ast_get_time_t(const char *src, time_t *dst, time_t _default, int *consumed)
* ast_str_append_va(...)
*/
int __ast_str_helper(struct ast_str **buf, size_t max_len,
int __ast_str_helper(struct ast_str **buf, ssize_t max_len,
int append, const char *fmt, va_list ap)
{
int res, need;
@@ -1692,7 +1692,7 @@ int __ast_str_helper(struct ast_str **buf, size_t max_len,
return AST_DYNSTR_BUILD_RETRY;
}
/* update space used, keep in mind the truncation */
(*buf)->used = (res + offset > (*buf)->len) ? (*buf)->len : res + offset;
(*buf)->used = (res + offset > (*buf)->len) ? (*buf)->len - 1 : res + offset;
return res;
}