From: Jesse Natalie <jenatali@microsoft.com>
Date: Mon, 19 Apr 2021 19:21:36 +0000 (-0700)
Subject: xmlconfig: Fix MSVC warning C4334 (32bit shift cast to 64bit)
X-Git-Tag: upstream/21.2.3~4588
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2b69dd68097ef86d3226aa074cb1bab6e6187707;p=platform%2Fupstream%2Fmesa.git

xmlconfig: Fix MSVC warning C4334 (32bit shift cast to 64bit)

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-By: Bill Kristiansen <billkris@microsoft.com>
Cc: mesa-stable@lists.freedesktop.org
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10331>
---

diff --git a/src/util/xmlconfig.c b/src/util/xmlconfig.c
index a3c6429..62b5e0d 100644
--- a/src/util/xmlconfig.c
+++ b/src/util/xmlconfig.c
@@ -321,8 +321,8 @@ driParseOptionInfo(driOptionCache *info,
     * config options we've ever seen in a driver.
     */
    info->tableSize = 6;
-   info->info = calloc(1 << info->tableSize, sizeof(driOptionInfo));
-   info->values = calloc(1 << info->tableSize, sizeof(driOptionValue));
+   info->info = calloc((size_t)1 << info->tableSize, sizeof(driOptionInfo));
+   info->values = calloc((size_t)1 << info->tableSize, sizeof(driOptionValue));
    if (info->info == NULL || info->values == NULL) {
       fprintf(stderr, "%s: %d: out of memory.\n", __FILE__, __LINE__);
       abort();
@@ -1109,13 +1109,13 @@ initOptionCache(driOptionCache *cache, const driOptionCache *info)
    unsigned i, size = 1 << info->tableSize;
    cache->info = info->info;
    cache->tableSize = info->tableSize;
-   cache->values = malloc((1<<info->tableSize) * sizeof(driOptionValue));
+   cache->values = malloc(((size_t)1 << info->tableSize) * sizeof(driOptionValue));
    if (cache->values == NULL) {
       fprintf(stderr, "%s: %d: out of memory.\n", __FILE__, __LINE__);
       abort();
    }
    memcpy(cache->values, info->values,
-           (1<<info->tableSize) * sizeof(driOptionValue));
+           ((size_t)1 << info->tableSize) * sizeof(driOptionValue));
    for (i = 0; i < size; ++i) {
       if (cache->info[i].type == DRI_STRING)
          XSTRDUP(cache->values[i]._string, info->values[i]._string);