Merge remote-tracking branch 'upstream/SDL2' into MorphOS

BeWorld2018 · Jan 14, 2024 · 5741ee0 · 5741ee0
2 parents aff8231 + 55dcc1e
commit 5741ee0
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 15 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,4 +1,4 @@
-Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
+Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
 
 This software is provided 'as-is', without any express or implied
 warranty.  In no event will the authors be held liable for any damages

diff --git a/VisualC/Version.rc b/VisualC/Version.rc
@@ -48,7 +48,7 @@ BEGIN
             VALUE "FileDescription", "SDL_net\0"
             VALUE "FileVersion", "2, 3, 0, 0\0"
             VALUE "InternalName", "SDL_net\0"
-            VALUE "LegalCopyright", "Copyright (C) 2023 Sam Lantinga\0"
+            VALUE "LegalCopyright", "Copyright (C) 2024 Sam Lantinga\0"
             VALUE "OriginalFilename", "SDL_net.dll\0"
             VALUE "ProductName", "Simple DirectMedia Layer\0"
             VALUE "ProductVersion", "2, 3, 0, 0\0"

diff --git a/examples/chat.c b/examples/chat.c
@@ -1,6 +1,6 @@
 /*
   CHAT:  A chat client using the SDL example network and GUI libraries
-  Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages

diff --git a/examples/chat.h b/examples/chat.h
@@ -1,6 +1,6 @@
 /*
   CHAT:  A chat client/server using the SDL example network library
-  Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages

diff --git a/examples/chatd.c b/examples/chatd.c
@@ -1,6 +1,6 @@
 /*
   CHATD:  A chat server using the SDL example network library
-  Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages

diff --git a/examples/showinterfaces.c b/examples/showinterfaces.c
@@ -1,6 +1,6 @@
 /*
   showinterfaces: a simple test program to show the network interfaces
-  Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages

diff --git a/include/SDL_net.h b/include/SDL_net.h
@@ -1,6 +1,6 @@
 /*
   SDL_net:  An example cross-platform network library for use with SDL
-  Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
   Copyright (C) 2012 Simeon Maxein <smaxein@googlemail.com>
 
   This software is provided 'as-is', without any express or implied

diff --git a/src/SDLnet.c b/src/SDLnet.c
@@ -1,6 +1,6 @@
 /*
   SDL_net:  An example cross-platform network library for use with SDL
-  Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
   Copyright (C) 2012 Simeon Maxein <smaxein@googlemail.com>
 
   This software is provided 'as-is', without any express or implied
@@ -293,10 +293,12 @@ int SDLNet_GetLocalAddresses(IPaddress *addresses, int maxcount)
     }
 
     if ((dwRetVal = GetAdaptersInfo(pAdapterInfo, &ulOutBufLen)) == ERROR_BUFFER_OVERFLOW) {
-        pAdapterInfo = (IP_ADAPTER_INFO *) SDL_realloc(pAdapterInfo, ulOutBufLen);
-        if (pAdapterInfo == NULL) {
+        PIP_ADAPTER_INFO pAdapterInfoTmp = (PIP_ADAPTER_INFO) SDL_realloc(pAdapterInfo, ulOutBufLen);
+        if (pAdapterInfoTmp == NULL) {
+            SDL_free(pAdapterInfo);
             return 0;
         }
+        pAdapterInfo = pAdapterInfoTmp;
         dwRetVal = GetAdaptersInfo(pAdapterInfo, &ulOutBufLen);
     }
 

diff --git a/src/SDLnetTCP.c b/src/SDLnetTCP.c
@@ -1,6 +1,6 @@
 /*
   SDL_net:  An example cross-platform network library for use with SDL
-  Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages

diff --git a/src/SDLnetUDP.c b/src/SDLnetUDP.c
@@ -1,6 +1,6 @@
 /*
   SDL_net:  An example cross-platform network library for use with SDL
-  Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages

diff --git a/src/SDLnetselect.c b/src/SDLnetselect.c
@@ -1,6 +1,6 @@
 /*
   SDL_net:  An example cross-platform network library for use with SDL
-  Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages

diff --git a/src/SDLnetsys.h b/src/SDLnetsys.h
@@ -1,6 +1,6 @@
 /*
   SDL_net:  An example cross-platform network library for use with SDL
-  Copyright (C) 1997-2023 Sam Lantinga <slouken@libsdl.org>
+  Copyright (C) 1997-2024 Sam Lantinga <slouken@libsdl.org>
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages

diff --git a/src/version.rc b/src/version.rc
@@ -25,7 +25,7 @@ BEGIN
             VALUE "FileDescription", "SDL_net\0"
             VALUE "FileVersion", "2, 3, 0, 0\0"
             VALUE "InternalName", "SDL_net\0"
-            VALUE "LegalCopyright", "Copyright (C) 2023 Sam Lantinga\0"
+            VALUE "LegalCopyright", "Copyright (C) 2024 Sam Lantinga\0"
             VALUE "OriginalFilename", "SDL_net.dll\0"
             VALUE "ProductName", "Simple DirectMedia Layer\0"
             VALUE "ProductVersion", "2, 3, 0, 0\0"