From ba1203b822878bad0f9c64557bdeffe0fb2dc816 Mon Sep 17 00:00:00 2001
From: kreatordxx <>
Date: Sun, 17 Feb 2008 04:47:38 +0000
Subject: [PATCH] use d_ memory functions in hmp2mid, since I already started
 to erroneously

---
 CHANGELOG.txt  |  1 +
 main/netpkt.c  |  2 ++
 misc/hmp2mid.c | 17 +++++++++--------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 888f6d87a..66d122a1c 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@ D2X-Rebirth Changelog
 20080217
 --------
 misc/hmp2mid.c: don't try and free mid_track_buf if it isn't allocated, if midi conversion doesn't work
+misc/hmp2mid.c: use d_ memory functions in hmp2mid, since I already started to erroneously
 
 20080212
 --------
diff --git a/main/netpkt.c b/main/netpkt.c
index 85f65da7d..b618843d0 100644
--- a/main/netpkt.c
+++ b/main/netpkt.c
@@ -317,6 +317,7 @@ void send_netgame_packet(ubyte *server, ubyte *node, ubyte *net_address, int lit
 	tmps = INTEL_SHORT(Netgame.PacketsPerSec);
 	memcpy(&(out_buffer[loc]), &tmps, 2);                   loc += 2;
 	memcpy(&(out_buffer[loc]), &(Netgame.ShortPackets), 1); loc ++;
+	memcpy(&(out_buffer[loc]), Netgame.AuxData, NETGAME_AUX_SIZE); loc += NETGAME_AUX_SIZE;
 
 do_send:
 	if (net_address != NULL)
@@ -413,6 +414,7 @@ void receive_netgame_packet(ubyte *data, netgame_info *netgame, int lite_flag)
 	memcpy(&(netgame->PacketsPerSec), &(data[loc]), 2);             loc += 2;
 	netgame->PacketsPerSec = INTEL_SHORT(netgame->PacketsPerSec);
 	memcpy(&(netgame->ShortPackets), &(data[loc]), 1);              loc ++;
+	memcpy(netgame->AuxData, &(data[loc]), NETGAME_AUX_SIZE);		loc += NETGAME_AUX_SIZE;
 
 }
 
diff --git a/misc/hmp2mid.c b/misc/hmp2mid.c
index e16d8d398..4f08eadd4 100644
--- a/misc/hmp2mid.c
+++ b/misc/hmp2mid.c
@@ -27,6 +27,7 @@
 #include <physfs/physfs.h>
 #endif
 #include "hmp2mid.h"
+#include "u_mem.h"
 
 /* Some convience macros to keep the code below more readable */
 
@@ -66,10 +67,10 @@
     if ((mid_track_buf_used + count) > mid_track_buf_size) \
     { \
       void *tmp = mid_track_buf; \
-      mid_track_buf = realloc(mid_track_buf, mid_track_buf_size + 65536); \
+      mid_track_buf = d_realloc(mid_track_buf, mid_track_buf_size + 65536); \
       if (!mid_track_buf) \
       { \
-        free(tmp); \
+        d_free(tmp); \
         return "Error could not allocate midi track memory"; \
       } \
     } \
@@ -134,7 +135,7 @@ const char *hmp2mid(PHYSFS_file *hmp_in, PHYSFS_file *mid_out)
     HMP_READ_DWORD(&t);
     if (t != i)
     {
-      free(mid_track_buf);
+      d_free(mid_track_buf);
       return "Error invalid hmp track number";
     }
     /* Read number of bytes in this track */
@@ -165,7 +166,7 @@ const char *hmp2mid(PHYSFS_file *hmp_in, PHYSFS_file *mid_out)
       
       if (n1 >= 4)
       {
-        free(mid_track_buf);
+        d_free(mid_track_buf);
         return "Error parsing hmp track";
       }
 
@@ -189,7 +190,7 @@ const char *hmp2mid(PHYSFS_file *hmp_in, PHYSFS_file *mid_out)
         {
           if (buf[2] != 0x00)
           {
-            free(mid_track_buf);
+            d_free(mid_track_buf);
             return "Error hmp meta end of track with non zero size";
           }
           break;
@@ -212,7 +213,7 @@ const char *hmp2mid(PHYSFS_file *hmp_in, PHYSFS_file *mid_out)
           t = 1;
           break;
         default:
-          free(mid_track_buf);
+          d_free(mid_track_buf);
           return "Error invalid hmp command";
       }
       if (buf[0] != last_com)
@@ -223,7 +224,7 @@ const char *hmp2mid(PHYSFS_file *hmp_in, PHYSFS_file *mid_out)
     }
     if (track_length != 0)
     {
-      free(mid_track_buf);
+      d_free(mid_track_buf);
       return "Error invalid track length";
     }
     /* write the midi track length */
@@ -235,6 +236,6 @@ const char *hmp2mid(PHYSFS_file *hmp_in, PHYSFS_file *mid_out)
     /* and the track itself */
     MID_WRITE(mid_track_buf, mid_track_buf_used);
   }
-  free (mid_track_buf);
+  d_free (mid_track_buf);
   return NULL;
 }