diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2017-02-23 12:10:08 +0100 |
---|---|---|
committer | Aron Budea <aron.budea@collabora.com> | 2018-01-19 05:53:07 +0100 |
commit | 73cc320bf3dfa30277b4dd444f6414b9d187fd90 (patch) | |
tree | e6500861751b655a61eeb9d29c57ecb75312ca37 | |
parent | e8974c1384abe27cba41e011cba1119dd95d37c5 (diff) |
-Werror=format-truncation
Change-Id: I1b27289724389018bd4048573e8c8e4cf28eb983
(cherry picked from commit 280cd27dbdab438e63ecb2599ab5dd20e04d71d5)
(cherry picked from commit 778c9d539326309abc93652cc06fbe8b28c8a0a1)
-rw-r--r-- | sal/osl/unx/file_volume.cxx | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sal/osl/unx/file_volume.cxx b/sal/osl/unx/file_volume.cxx index 28ce4a9762a4..722b18dd564e 100644 --- a/sal/osl/unx/file_volume.cxx +++ b/sal/osl/unx/file_volume.cxx @@ -17,6 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + +#include <cassert> + #include "osl/file.h" #include "osl/diagnose.h" @@ -353,7 +357,7 @@ static rtl_uString* oslMakeUStrFromPsz(const sal_Char* pszStr, rtl_uString** ust oslFileError osl_getVolumeDeviceMountPath( oslVolumeDeviceHandle Handle, rtl_uString **pstrPath ) { oslVolumeDeviceHandleImpl* pItem = static_cast<oslVolumeDeviceHandleImpl*>(Handle); - sal_Char Buffer[PATH_MAX]; + sal_Char Buffer[RTL_CONSTASCII_LENGTH("file://") + PATH_MAX]; Buffer[0] = '\0'; @@ -367,7 +371,8 @@ oslFileError osl_getVolumeDeviceMountPath( oslVolumeDeviceHandle Handle, rtl_uSt return osl_File_E_INVAL; } - snprintf(Buffer, sizeof(Buffer), "file://%s", pItem->pszMountPoint); + int n = snprintf(Buffer, sizeof(Buffer), "file://%s", pItem->pszMountPoint); + assert(n >= 0 && unsigned(n) < sizeof(Buffer)); (void) n; #ifdef DEBUG_OSL_FILE fprintf(stderr,"Mount Point is: '%s'\n",Buffer); |