diff options
Diffstat (limited to 'open-vm-tools/lib/misc/utilMem.c')
| -rw-r--r-- | open-vm-tools/lib/misc/utilMem.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/open-vm-tools/lib/misc/utilMem.c b/open-vm-tools/lib/misc/utilMem.c index 6f4a3bca..a527cfa1 100644 --- a/open-vm-tools/lib/misc/utilMem.c +++ b/open-vm-tools/lib/misc/utilMem.c @@ -1,5 +1,5 @@ /********************************************************* - * Copyright (C) 2009 VMware, Inc. All rights reserved. + * Copyright (C) 2009-2015 VMware, Inc. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU Lesser General Public License as published @@ -30,6 +30,7 @@ #include <stdlib.h> #include "vm_assert.h" +#include "util.h" #ifdef __APPLE__ #include <TargetConditionals.h> @@ -275,7 +276,7 @@ UtilSafeStrndup0(const char *s, // IN: } null = memchr(s, '\0', n); - size = null ? null - s : n; + size = null ? (size_t)(null - s) : n; newSize = size + 1; if (newSize < size) { // Prevent integer overflow copy = NULL; @@ -310,7 +311,7 @@ UtilSafeStrndup1(const char *s, // IN: } null = memchr(s, '\0', n); - size = null ? null - s : n; + size = null ? (size_t)(null - s) : n; newSize = size + 1; if (newSize < size) { // Prevent integer overflow copy = NULL; |