[PATCH 0/1] MR5283: opengl32: Replace sprintf with snprintf/asprintf to avoid deprecation warnings on macOS.

[PATCH 1/1] opengl32: Replace sprintf with snprintf/asprintf to avoid deprecation warnings on macOS.

[Brendan Shanks]

From: Brendan Shanks

---
 dlls/opengl32/unix_wgl.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c
index 453a9824046..b75a940d1d6 100644
--- a/dlls/opengl32/unix_wgl.c
+++ b/dlls/opengl32/unix_wgl.c
@@ -318,13 +318,13 @@ static HKEY open_hkcu_key( const char *name )
             return 0;

sid = ((TOKEN_USER *)sid_data)->User.Sid;
-        len = sprintf( buffer, "\Registry\User\S-%u-%u", sid->Revision,
-                       (int)MAKELONG( MAKEWORD( sid->IdentifierAuthority.Value[5],
-                                                sid->IdentifierAuthority.Value[4] ),
-                                      MAKEWORD( sid->IdentifierAuthority.Value[3],
-                                                sid->IdentifierAuthority.Value[2] )));
+        len = snprintf( buffer, sizeof(buffer), "\Registry\User\S-%u-%u", sid->Revision,
+                        (int)MAKELONG( MAKEWORD( sid->IdentifierAuthority.Value[5],
+                                                 sid->IdentifierAuthority.Value[4] ),
+                                       MAKEWORD( sid->IdentifierAuthority.Value[3],
+                                                 sid->IdentifierAuthority.Value[2] )));
         for (i = 0; i < sid->SubAuthorityCount; i++)
-            len += sprintf( buffer + len, "-%u", (int)sid->SubAuthority[i] );
+            len += snprintf( buffer + len, sizeof(buffer) - len, "-%u", (int)sid->SubAuthority[i] );

ascii_to_unicode( bufferW, buffer, len );
         hkcu = reg_open_key( NULL, bufferW, len * sizeof(WCHAR) );
@@ -491,9 +491,9 @@ static const GLubyte *wrap_glGetString( TEB *teb, GLenum name )
             /* 4.4 depends on ARB_buffer_storage, which we don't support on wow64. */
             if (major > 4 || (major == 4 && minor >= 4))
             {
-                char *str = malloc( 3 + strlen( rest ) + 1 );
+                char *str = NULL;

-                sprintf( str, "4.3%s", rest );
+                asprintf( &str, "4.3%s", rest );
                 if (InterlockedCompareExchangePointer( (void **)&ptr->u.context->version_string, str, NULL ))
                     free( str );
                 return ptr->u.context->version_string;
@@ -536,7 +536,7 @@ static char *build_extension_list( TEB *teb )
         capacity = max( capacity, len + strlen( extension ) + 2 );
         if (!(tmp = realloc( available_extensions, capacity ))) break;
         available_extensions = tmp;
-        len += sprintf( available_extensions + len, "%s ", extension );
+        len += snprintf( available_extensions + len, capacity - len, "%s ", extension );
     }
     if (len) available_extensions[len - 1] = 0;

[PATCH 1/1] opengl32: Replace sprintf with snprintf/asprintf to avoid deprecation warnings on macOS.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=143970

Your paranoid android.

=== debian11b (64 bit WoW report) ===

secur32:
schannel.c:538: Test failed: cert_cnt = 2