When using ast_str with a non-ast_str-enabled API, we need to update the buffer

or otherwise, we cannot use ast_str_strlen().

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@168090 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/include/asterisk/strings.h b/include/asterisk/strings.h
index 529456c..bf3cf32 100644 (file)
--- a/include/asterisk/strings.h
+++ b/include/asterisk/strings.h
@@ -403,6 +403,16 @@ void ast_str_reset(struct ast_str *buf),
 }
 )
 
+/*! \brief Update the length of the buffer, after using ast_str merely as a buffer.
+ *  \param buf A pointer to the ast_str string.
+ */
+AST_INLINE_API(
+void ast_str_update(struct ast_str *buf),
+{
+       buf->__AST_STR_USED = strlen(buf->__AST_STR_STR);
+}
+)
+
 /*! \brief Trims trailing whitespace characters from an ast_str string.
  *  \param buf A pointer to the ast_str string.
  */

diff --git a/res/res_agi.c b/res/res_agi.c
index 926d4d9..6151549 100644 (file)
--- a/res/res_agi.c
+++ b/res/res_agi.c
@@ -1861,6 +1861,7 @@ static int handle_dbget(struct ast_channel *chan, AGI *agi, int argc, char **arg
 
        do {
                res = ast_db_get(argv[2], argv[3], ast_str_buffer(buf), ast_str_size(buf));
+               ast_str_update(buf);
                if (ast_str_strlen(buf) < ast_str_size(buf) - 1) {
                        break;
                }