ast_str: Fix improper member access to struct ast_str members.

Accessing members of struct ast_str outside of the string manipulation API
routines is invalid since struct ast_str is supposed to be treated as
opaque.

Review: https://reviewboard.asterisk.org/r/4194/

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 004691bcb5c3b1e0b3e4ded28849480536af8326..8ac9aaeacb699d1f48abc46ebda4b0bb7d904ac4 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -9398,7 +9398,7 @@ static unsigned int set_pvt_allowed_methods(struct sip_pvt *pvt, struct sip_requ
        This is enabled if pedanticsipchecking is enabled */
 static void lws2sws(struct ast_str *data)
 {
-       char *msgbuf = data->str;
+       char *msgbuf = ast_str_buffer(data);
        int len = ast_str_strlen(data);
        int h = 0, t = 0;
        int lws = 0;
@@ -9439,7 +9439,7 @@ static void lws2sws(struct ast_str *data)
                        lws = 0;
        }
        msgbuf[t] = '\0';
-       data->used = t;
+       ast_str_update(data);
 }
 
 /*! \brief Parse a SIP message
@@ -9447,7 +9447,7 @@ static void lws2sws(struct ast_str *data)
 */
 static int parse_request(struct sip_request *req)
 {
-       char *c = req->data->str;
+       char *c = ast_str_buffer(req->data);
        ptrdiff_t *dst = req->header;
        int i = 0, lim = SIP_MAX_HEADERS - 1;
        unsigned int skipping_headers = 0;
@@ -13547,12 +13547,12 @@ static int transmit_response_with_sdp(struct sip_pvt *p, const char *msg, const
 /*! \brief Parse first line of incoming SIP request */
 static int determine_firstline_parts(struct sip_request *req)
 {
-       char *e = ast_skip_blanks(req->data->str);      /* there shouldn't be any */
+       char *e = ast_skip_blanks(ast_str_buffer(req->data));   /* there shouldn't be any */
        char *local_rlpart1;
 
        if (!*e)
                return -1;
-       req->rlpart1 = e - req->data->str;      /* method or protocol */
+       req->rlpart1 = e - ast_str_buffer(req->data);   /* method or protocol */
        local_rlpart1 = e;
        e = ast_skip_nonblanks(e);
        if (*e)
@@ -13566,7 +13566,7 @@ static int determine_firstline_parts(struct sip_request *req)
        if (!strcasecmp(local_rlpart1, "SIP/2.0") ) { /* We have a response */
                if (strlen(e) < 3)      /* status code is 3 digits */
                        return -1;
-               req->rlpart2 = e - req->data->str;
+               req->rlpart2 = e - ast_str_buffer(req->data);
        } else { /* We have a request */
                if ( *e == '<' ) { /* XXX the spec says it must not be in <> ! */
                        ast_debug(3, "Oops. Bogus uri in <> %s\n", e);
@@ -13574,7 +13574,7 @@ static int determine_firstline_parts(struct sip_request *req)
                        if (!*e)
                                return -1;
                }
-               req->rlpart2 = e - req->data->str;      /* URI */
+               req->rlpart2 = e - ast_str_buffer(req->data);   /* URI */
                e = ast_skip_nonblanks(e);
                if (*e)
                        *e++ = '\0';
@@ -16374,7 +16374,7 @@ static enum check_auth_result check_auth(struct sip_pvt *p, struct sip_request *
                return AUTH_SECRET_FAILED; /*! XXX \todo need a better return code here */
        }
 
-       c = buf->str;
+       c = ast_str_buffer(buf);
 
        sip_digest_parser(c, keys);
 
@@ -16700,7 +16700,7 @@ static void transmit_fake_auth_response(struct sip_pvt *p, struct sip_request *r
                return;
        }
 
-       c = buf->str;
+       c = ast_str_buffer(buf);
 
        while (c && *(c = ast_skip_blanks(c))) { /* lookup for keys */
                for (i = keys; i->key != NULL; i++) {

diff --git a/channels/sip/security_events.c b/channels/sip/security_events.c
index 85799ab08dab1fc898a8c925190fd27726179d8f..6ed25b2388dbf3404d7976ee5b6e65277f38d7c9 100644 (file)
--- a/channels/sip/security_events.c
+++ b/channels/sip/security_events.c
@@ -324,7 +324,7 @@ int sip_report_security_event(const struct sip_pvt *p, const struct sip_request
                authtoken = sip_get_header(req, reqheader);
                buf = ast_str_thread_get(&check_auth_buf, CHECK_AUTH_BUF_INITLEN);
                ast_str_set(&buf, 0, "%s", authtoken);
-               c = buf->str;
+               c = ast_str_buffer(buf);
 
                sip_digest_parser(c, keys);
 

diff --git a/res/res_calendar.c b/res/res_calendar.c
index a9a082874be1b8226dee871f93abbc3705c44cd2..6e367c1c05d12156da942f6ab1129cc315b361e2 100644 (file)
--- a/res/res_calendar.c
+++ b/res/res_calendar.c
@@ -777,7 +777,7 @@ static void *do_notify(void *data)
 
        for (itervar = event->owner->vars; itervar; itervar = itervar->next) {
                ast_str_substitute_variables(&tmpstr, 0, chan, itervar->value);
-               pbx_builtin_setvar_helper(chan, itervar->name, tmpstr->str);
+               pbx_builtin_setvar_helper(chan, itervar->name, ast_str_buffer(tmpstr));
        }
 
        if (!(apptext = ast_str_create(32))) {