Józef Kucia : msvcrt: Fix precision handling for string arguments.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2a2f525eb3cb220759c1079b2c9c96bc98667ec2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2a2f525eb3cb220759c1079b2c...

Author: Józef Kucia <jkucia(a)codeweavers.com>
Date:   Thu Aug 31 19:22:55 2017 +0200

msvcrt: Fix precision handling for string arguments.

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com>
Signed-off-by: Piotr Caban <piotr(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/msvcrt/msvcrt.h |  2 ++
 dlls/msvcrt/printf.h | 18 ++++++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h
index 845b267..c39beca 100644
--- a/dlls/msvcrt/msvcrt.h
+++ b/dlls/msvcrt/msvcrt.h
@@ -1094,6 +1094,8 @@ char*** __cdecl  MSVCRT___p__environ(void);
 int*    __cdecl  __p___mb_cur_max(void);
 unsigned int*  __cdecl __p__fmode(void);
 MSVCRT_wchar_t* __cdecl MSVCRT__wcsdup(const MSVCRT_wchar_t*);
+MSVCRT_size_t __cdecl MSVCRT_strnlen(const char *,MSVCRT_size_t);
+MSVCRT_size_t __cdecl MSVCRT_wcsnlen(const MSVCRT_wchar_t*,MSVCRT_size_t);
 MSVCRT_wchar_t*** __cdecl MSVCRT___p__wenviron(void);
 INT     __cdecl MSVCRT_wctomb(char*,MSVCRT_wchar_t);
 char*   __cdecl MSVCRT__strdate(char* date);
diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h
index 8bb3382..fe1e127 100644
--- a/dlls/msvcrt/printf.h
+++ b/dlls/msvcrt/printf.h
@@ -165,8 +165,13 @@ static inline int FUNC_NAME(pf_output_format_wstr)(FUNC_NAME(puts_clbk) pf_puts,
 {
     int r, ret;
 
-    if(len < 0)
-        len = strlenW(str);
+    if(len < 0) {
+        /* Do not search past the length specified by the precision. */
+        if(flags->Precision>=0)
+            len = MSVCRT_wcsnlen(str, flags->Precision);
+        else
+            len = strlenW(str);
+    }
 
     if(flags->Precision>=0 && flags->Precision<len)
         len = flags->Precision;
@@ -190,8 +195,13 @@ static inline int FUNC_NAME(pf_output_format_str)(FUNC_NAME(puts_clbk) pf_puts,
 {
     int r, ret;
 
-    if(len < 0)
-        len = strlen(str);
+    if(len < 0) {
+        /* Do not search past the length specified by the precision. */
+        if(flags->Precision>=0)
+            len = MSVCRT_strnlen(str, flags->Precision);
+        else
+            len = strlen(str);
+    }
 
     if(flags->Precision>=0 && flags->Precision<len)
         len = flags->Precision;