[PATCH] wldap32: Use correct integer type when calling ber_printf() or ber_scanf().

[Conor McCarthy]

GCC compiles ber_tag_t and ber_len_t as 64-bit types on 64-bit machines,
but in Win64 they are 32-bit. As va_list arguments they pass unchecked and
unconverted.

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com>
---
 dlls/wldap32/ber.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/dlls/wldap32/ber.c b/dlls/wldap32/ber.c
index c2c6f269..d8fd502d 100644
--- a/dlls/wldap32/ber.c
+++ b/dlls/wldap32/ber.c
@@ -353,7 +353,7 @@ INT WINAPIV WLDAP32_ber_printf( BerElement *berelement, PCHAR fmt, ... )
             }
         case 't':
             {
-                unsigned int tag = va_arg( list, unsigned int );
+                ber_tag_t tag = va_arg( list, ULONG );
                 ret = ber_printf( berelement, new_fmt, tag );
                 break;
             }
@@ -372,7 +372,7 @@ INT WINAPIV WLDAP32_ber_printf( BerElement *berelement, PCHAR fmt, ... )
         case 'X':
             {
                 char *str = va_arg( list, char * );
-                int len = va_arg( list, int );
+                ber_len_t len = va_arg( list, ULONG );
                 new_fmt[0] = 'B';  /* 'X' is deprecated */
                 ret = ber_printf( berelement, new_fmt, str, len );
                 break;
@@ -447,8 +447,10 @@ INT WINAPIV WLDAP32_ber_scanf( BerElement *berelement, PCHAR fmt, ... )
             }
         case 't':
             {
-                unsigned int *tag = va_arg( list, unsigned int * );
-                ret = ber_scanf( berelement, new_fmt, tag );
+                ULONG *tag = va_arg( list, ULONG * );
+                ber_tag_t ber_tag;
+                ret = ber_scanf( berelement, new_fmt, &ber_tag );
+                *tag = ber_tag;
                 break;
             }
         case 'v':
@@ -460,8 +462,10 @@ INT WINAPIV WLDAP32_ber_scanf( BerElement *berelement, PCHAR fmt, ... )
         case 'B':
             {
                 char **str = va_arg( list, char ** );
-                int *len = va_arg( list, int * );
-                ret = ber_scanf( berelement, new_fmt, str, len );
+                ULONG *len = va_arg( list, ULONG * );
+                ber_len_t ber_len;
+                ret = ber_scanf( berelement, new_fmt, str, &ber_len );
+                *len = ber_len;
                 break;
             }
         case 'O':
-- 
2.22.0

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=54816

Your paranoid android.


=== debian9 (build log) ===

../../../wine/dlls/wldap32/ber.c:356:17: error: unknown type name ‘ber_tag_t’
../../../wine/dlls/wldap32/ber.c:375:17: error: unknown type name ‘ber_len_t’
../../../wine/dlls/wldap32/ber.c:451:17: error: unknown type name ‘ber_tag_t’
../../../wine/dlls/wldap32/ber.c:466:17: error: unknown type name ‘ber_len_t’
Makefile:209: recipe for target 'ber.o' failed
Makefile:8384: recipe for target 'dlls/wldap32' failed
Task: The win32 build failed

=== debian9 (build log) ===

../../../wine/dlls/wldap32/ber.c:356:17: error: unknown type name ‘ber_tag_t’
../../../wine/dlls/wldap32/ber.c:375:17: error: unknown type name ‘ber_len_t’
../../../wine/dlls/wldap32/ber.c:451:17: error: unknown type name ‘ber_tag_t’
../../../wine/dlls/wldap32/ber.c:466:17: error: unknown type name ‘ber_len_t’
Makefile:209: recipe for target 'ber.o' failed
Makefile:8173: recipe for target 'dlls/wldap32' failed
Task: The wow64 build failed