Commit 6d9dd5fb authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-qobject-2018-07-27-v2' into staging 



QObject patches for 2018-07-27 (3.0.0-rc3)

# gpg: Signature made Sat 28 Jul 2018 08:10:39 BST
# gpg:                using RSA key 3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-qobject-2018-07-27-v2:
  qstring: Move qstring_from_substr()'s @end one to the right
  qstring: Assert size calculations don't overflow
  qstring: Fix qstring_from_substr() not to provoke int overflow

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 18a398f6 ba891d68

block/blkdebug.c

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ static void blkdebug_parse_filename(const char *filename, QDict *options, 


    if (c != filename) {

        QString *config_path;

        config_path = qstring_from_substr(filename, 0, c - filename - 1);

        config_path = qstring_from_substr(filename, 0, c - filename);

        qdict_put(options, "config", config_path);

    }

block/blkverify.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ static void blkverify_parse_filename(const char *filename, QDict *options, 
    }



    /* TODO Implement option pass-through and set raw.filename here */

    raw_path = qstring_from_substr(filename, 0, c - filename - 1);

    raw_path = qstring_from_substr(filename, 0, c - filename);

    qdict_put(options, "x-raw", raw_path);



    /* TODO Allow multi-level nesting and set file.filename here */

block/nbd.c

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static int nbd_parse_uri(const char *filename, QDict *options) 
        /* strip braces from literal IPv6 address */

        if (uri->server[0] == '[') {

            host = qstring_from_substr(uri->server, 1,

                                       strlen(uri->server) - 2);

                                       strlen(uri->server) - 1);

        } else {

            host = qstring_from_str(uri->server);

        }

include/qapi/qmp/qstring.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ struct QString { 


QString *qstring_new(void);

QString *qstring_from_str(const char *str);

QString *qstring_from_substr(const char *str, int start, int end);

QString *qstring_from_substr(const char *str, size_t start, size_t end);

size_t qstring_get_length(const QString *qstring);

const char *qstring_get_str(const QString *qstring);

const char *qstring_get_try_str(const QString *qstring);

qobject/qstring.c

+8 −4
Original line number Diff line number Diff line
@@ -37,21 +37,23 @@ size_t qstring_get_length(const QString *qstring) 
 *

 * Return string reference

 */

QString *qstring_from_substr(const char *str, int start, int end)

QString *qstring_from_substr(const char *str, size_t start, size_t end)

{

    QString *qstring;



    assert(start <= end);



    qstring = g_malloc(sizeof(*qstring));

    qobject_init(QOBJECT(qstring), QTYPE_QSTRING);



    qstring->length = end - start + 1;

    qstring->length = end - start;

    qstring->capacity = qstring->length;



    assert(qstring->capacity < SIZE_MAX);

    qstring->string = g_malloc(qstring->capacity + 1);

    memcpy(qstring->string, str + start, qstring->length);

    qstring->string[qstring->length] = 0;





    return qstring;

}
@@ -62,13 +64,15 @@ QString *qstring_from_substr(const char *str, int start, int end) 
 */

QString *qstring_from_str(const char *str)

{

    return qstring_from_substr(str, 0, strlen(str) - 1);

    return qstring_from_substr(str, 0, strlen(str));

}



static void capacity_increase(QString *qstring, size_t len)

{

    if (qstring->capacity < (qstring->length + len)) {

        assert(len <= SIZE_MAX - qstring->capacity);

        qstring->capacity += len;

        assert(qstring->capacity <= SIZE_MAX / 2);

        qstring->capacity *= 2; /* use exponential growth */



        qstring->string = g_realloc(qstring->string, qstring->capacity + 1);