diff options
author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-17 21:28:51 +0000 |
---|---|---|
committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-02-17 21:28:51 +0000 |
commit | 9c618025f8e0d5cd85f2317c4134a063166ad893 (patch) | |
tree | 7b3789b801a03d91cc82878daa833c0b63f4694e /include | |
parent | b38f2df55d48c398ab16a31d01071630f00253b4 (diff) |
Merged revisions 247335 via svnmerge from
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@247336 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rw-r--r-- | include/asterisk/strings.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/asterisk/strings.h b/include/asterisk/strings.h index 1e78c04c7..143859302 100644 --- a/include/asterisk/strings.h +++ b/include/asterisk/strings.h @@ -592,7 +592,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); /*! @@ -633,7 +633,7 @@ int __attribute__((format(printf, 4, 0))) __ast_str_helper(struct ast_str **buf, * } * \endcode */ -AST_INLINE_API(int __attribute__((format(printf, 3, 0))) ast_str_set_va(struct ast_str **buf, size_t max_len, const char *fmt, va_list ap), +AST_INLINE_API(int __attribute__((format(printf, 3, 0))) ast_str_set_va(struct ast_str **buf, ssize_t max_len, const char *fmt, va_list ap), { return __ast_str_helper(buf, max_len, 0, fmt, ap); } @@ -644,7 +644,7 @@ AST_INLINE_API(int __attribute__((format(printf, 3, 0))) ast_str_set_va(struct a * * Same as ast_str_set_va(), but append to the current content. */ -AST_INLINE_API(int __attribute__((format(printf, 3, 0))) ast_str_append_va(struct ast_str **buf, size_t max_len, const char *fmt, va_list ap), +AST_INLINE_API(int __attribute__((format(printf, 3, 0))) ast_str_append_va(struct ast_str **buf, ssize_t max_len, const char *fmt, va_list ap), { return __ast_str_helper(buf, max_len, 1, fmt, ap); } @@ -669,7 +669,7 @@ AST_INLINE_API(int __attribute__((format(printf, 3, 0))) ast_str_append_va(struc */ 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; @@ -690,7 +690,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; |