From b06efc78ecb688bd172a7d9da9e84e091c9a053e Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Tue, 29 Oct 2019 12:57:19 +0100 Subject: [PATCH] Fixed warnings from TestEnvironmentGetEnvironmentStrings --- .../test/TestEnvironmentGetEnvironmentStrings.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/winpr/libwinpr/environment/test/TestEnvironmentGetEnvironmentStrings.c b/winpr/libwinpr/environment/test/TestEnvironmentGetEnvironmentStrings.c index 238e5a2..b037a9d 100644 --- a/winpr/libwinpr/environment/test/TestEnvironmentGetEnvironmentStrings.c +++ b/winpr/libwinpr/environment/test/TestEnvironmentGetEnvironmentStrings.c @@ -6,23 +6,33 @@ int TestEnvironmentGetEnvironmentStrings(int argc, char* argv[]) { + int r = -1; TCHAR* p; - int length; + size_t length; LPTCH lpszEnvironmentBlock; + WINPR_UNUSED(argc); + WINPR_UNUSED(argv); + lpszEnvironmentBlock = GetEnvironmentStrings(); p = (TCHAR*) lpszEnvironmentBlock; while (p[0] && p[1]) { - _tprintf(_T("%s\n"), p); + const int rc = _tprintf(_T("%s\n"), p); + if (rc < 1) + goto fail; length = _tcslen(p); + if (length != (size_t)(rc - 1)) + goto fail; p += (length + 1); } + r = 0; +fail: FreeEnvironmentStrings(lpszEnvironmentBlock); - return 0; + return r; } -- 2.7.4