Merge \"Add bound checks to utf16_to_utf8\" into nyc-mr1-dev

       return NO_ERROR;

    }

    ssize_t utf8Size = utf16_to_utf8_length(src, utf16Size);

    if (utf8Size < 0) {

    // Allow for closing '\0'

    ssize_t utf8Size = utf16_to_utf8_length(src, utf16Size) + 1;

    if (utf8Size < 1) {

        return BAD_VALUE;

    }

    // Note that while it is probably safe to assume string::resize keeps a

    // spare byte around for the trailing null, we're going to be explicit.

    str->resize(utf8Size + 1);

    utf16_to_utf8(src, utf16Size, &((*str)[0]));

    // spare byte around for the trailing null, we still pass the size including the trailing null

    str->resize(utf8Size);

    utf16_to_utf8(src, utf16Size, &((*str)[0]), utf8Size);

    str->resize(utf8Size - 1);

    return NO_ERROR;

}