use d_ memory functions in hmp2mid, since I already started to erroneously
This commit is contained in:
parent
bdabfbfd5a
commit
ba1203b822
|
@ -3,6 +3,7 @@ D2X-Rebirth Changelog
|
||||||
20080217
|
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: 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
|
20080212
|
||||||
--------
|
--------
|
||||||
|
|
|
@ -317,6 +317,7 @@ void send_netgame_packet(ubyte *server, ubyte *node, ubyte *net_address, int lit
|
||||||
tmps = INTEL_SHORT(Netgame.PacketsPerSec);
|
tmps = INTEL_SHORT(Netgame.PacketsPerSec);
|
||||||
memcpy(&(out_buffer[loc]), &tmps, 2); loc += 2;
|
memcpy(&(out_buffer[loc]), &tmps, 2); loc += 2;
|
||||||
memcpy(&(out_buffer[loc]), &(Netgame.ShortPackets), 1); loc ++;
|
memcpy(&(out_buffer[loc]), &(Netgame.ShortPackets), 1); loc ++;
|
||||||
|
memcpy(&(out_buffer[loc]), Netgame.AuxData, NETGAME_AUX_SIZE); loc += NETGAME_AUX_SIZE;
|
||||||
|
|
||||||
do_send:
|
do_send:
|
||||||
if (net_address != NULL)
|
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;
|
memcpy(&(netgame->PacketsPerSec), &(data[loc]), 2); loc += 2;
|
||||||
netgame->PacketsPerSec = INTEL_SHORT(netgame->PacketsPerSec);
|
netgame->PacketsPerSec = INTEL_SHORT(netgame->PacketsPerSec);
|
||||||
memcpy(&(netgame->ShortPackets), &(data[loc]), 1); loc ++;
|
memcpy(&(netgame->ShortPackets), &(data[loc]), 1); loc ++;
|
||||||
|
memcpy(netgame->AuxData, &(data[loc]), NETGAME_AUX_SIZE); loc += NETGAME_AUX_SIZE;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -27,6 +27,7 @@
|
||||||
#include <physfs/physfs.h>
|
#include <physfs/physfs.h>
|
||||||
#endif
|
#endif
|
||||||
#include "hmp2mid.h"
|
#include "hmp2mid.h"
|
||||||
|
#include "u_mem.h"
|
||||||
|
|
||||||
/* Some convience macros to keep the code below more readable */
|
/* Some convience macros to keep the code below more readable */
|
||||||
|
|
||||||
|
@ -66,10 +67,10 @@
|
||||||
if ((mid_track_buf_used + count) > mid_track_buf_size) \
|
if ((mid_track_buf_used + count) > mid_track_buf_size) \
|
||||||
{ \
|
{ \
|
||||||
void *tmp = mid_track_buf; \
|
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) \
|
if (!mid_track_buf) \
|
||||||
{ \
|
{ \
|
||||||
free(tmp); \
|
d_free(tmp); \
|
||||||
return "Error could not allocate midi track memory"; \
|
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);
|
HMP_READ_DWORD(&t);
|
||||||
if (t != i)
|
if (t != i)
|
||||||
{
|
{
|
||||||
free(mid_track_buf);
|
d_free(mid_track_buf);
|
||||||
return "Error invalid hmp track number";
|
return "Error invalid hmp track number";
|
||||||
}
|
}
|
||||||
/* Read number of bytes in this track */
|
/* 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)
|
if (n1 >= 4)
|
||||||
{
|
{
|
||||||
free(mid_track_buf);
|
d_free(mid_track_buf);
|
||||||
return "Error parsing hmp track";
|
return "Error parsing hmp track";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -189,7 +190,7 @@ const char *hmp2mid(PHYSFS_file *hmp_in, PHYSFS_file *mid_out)
|
||||||
{
|
{
|
||||||
if (buf[2] != 0x00)
|
if (buf[2] != 0x00)
|
||||||
{
|
{
|
||||||
free(mid_track_buf);
|
d_free(mid_track_buf);
|
||||||
return "Error hmp meta end of track with non zero size";
|
return "Error hmp meta end of track with non zero size";
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
@ -212,7 +213,7 @@ const char *hmp2mid(PHYSFS_file *hmp_in, PHYSFS_file *mid_out)
|
||||||
t = 1;
|
t = 1;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
free(mid_track_buf);
|
d_free(mid_track_buf);
|
||||||
return "Error invalid hmp command";
|
return "Error invalid hmp command";
|
||||||
}
|
}
|
||||||
if (buf[0] != last_com)
|
if (buf[0] != last_com)
|
||||||
|
@ -223,7 +224,7 @@ const char *hmp2mid(PHYSFS_file *hmp_in, PHYSFS_file *mid_out)
|
||||||
}
|
}
|
||||||
if (track_length != 0)
|
if (track_length != 0)
|
||||||
{
|
{
|
||||||
free(mid_track_buf);
|
d_free(mid_track_buf);
|
||||||
return "Error invalid track length";
|
return "Error invalid track length";
|
||||||
}
|
}
|
||||||
/* write the midi 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 */
|
/* and the track itself */
|
||||||
MID_WRITE(mid_track_buf, mid_track_buf_used);
|
MID_WRITE(mid_track_buf, mid_track_buf_used);
|
||||||
}
|
}
|
||||||
free (mid_track_buf);
|
d_free (mid_track_buf);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue