1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
|
$NetBSD: patch-am,v 1.1 2006/06/30 12:54:38 tron Exp $
--- src/loaders/mdl_load.c.orig 2000-12-29 18:08:33.000000000 +0000
+++ src/loaders/mdl_load.c 2006-06-30 12:57:09.000000000 +0100
@@ -35,6 +35,35 @@
static struct mdl_envelope *v_env;
static struct mdl_envelope *p_env;
+static void *
+get_uint16_le(void *p, uint16_t *x16)
+{
+ uint8_t *bp;
+
+ bp = p;
+ *x16 = bp[0] | (bp[1] << 8);
+ return bp + sizeof(uint16);
+}
+
+static void *
+get_uint16_le_int(void *p, int *ip)
+{
+ uint8_t *bp;
+
+ bp = p;
+ *ip = bp[0] | (bp[1] << 8);
+ return bp + sizeof(uint16);
+}
+
+static void *
+get_uint32_le_int(void *p, int *ip)
+{
+ uint8_t *bp;
+
+ bp = p;
+ *ip = bp[0] | (bp[1] << 8) | (bp[2] << 16) | (bp[3] << 24);
+ return bp + sizeof(uint32);
+}
/* Effects 1-6 (note effects) can only be entered in the first effect
* column, G-L (volume-effects) only in the second column.
@@ -130,7 +159,8 @@
unsigned int x;
if (i == 0) {
- b = *((uint32 *)(*buf))++;
+ (void)memcpy(&b, *buf, sizeof(b));
+ *buf += sizeof(b);
n = 32;
return 0;
}
@@ -268,8 +298,7 @@
buffer += 16; /* Skip pattern name */
for (j = 0; j < chn; j++) {
- x16 = *((uint16 *)buffer)++;
- L_ENDIAN16 (x16);
+ buffer = get_uint16_le(buffer, &x16);
xxp[i]->info[j].index = x16;
}
if (V (0))
@@ -297,8 +326,7 @@
xxp[i]->rows = 64;
for (j = 0; j < 32; j++) {
- x16 = *((uint16 *)buffer)++;
- L_ENDIAN16 (x16);
+ buffer = get_uint16_le(buffer, &x16);
if (j < xxh->chn)
xxp[i]->info[j].index = x16;
}
@@ -315,7 +343,8 @@
int i, j, k, row, len;
struct xxm_track *track;
- xxh->trk = *((uint16 *) buffer)++ + 1;
+ buffer = get_uint16_le_int(buffer, &xxh->trk);
+ xxh->trk++;
if (V (0))
report ("Stored tracks : %d ", xxh->trk);
@@ -330,7 +359,7 @@
for (i = 1; i < xxh->trk; i++) {
/* Length of the track in bytes */
- len = *((uint16 *) buffer)++;
+ buffer = get_uint16_le_int(buffer, &len);
memset (track, 0, sizeof (struct xxm_track) +
sizeof (struct xxm_event) * 256);
@@ -449,7 +478,7 @@
xxih[i].rls = *(uint16 *)buffer;
L_ENDIAN32 (xxih[i].rls);
}
- ((uint16 *)buffer)++;
+ buffer += sizeof(uint16);
xxi[i][j].vra = *buffer++;
xxi[i][j].vde = *buffer++;
@@ -498,15 +527,12 @@
buffer += 32; /* Sample name */
buffer += 8; /* Sample filename */
- c2spd[i] = *((uint32 *)buffer)++;
+ (void)memcpy(&c2spd[i], buffer, sizeof(c2spd[i]));
+ buffer += sizeof(c2spd[i]);
- xxs[i].len = *((uint32 *)buffer)++;
- xxs[i].lps = *((uint32 *)buffer)++;
- xxs[i].lpe = *((uint32 *)buffer)++;
-
- L_ENDIAN32 (xxs[i].len);
- L_ENDIAN32 (xxs[i].lps);
- L_ENDIAN32 (xxs[i].lpe);
+ buffer = get_uint32_le_int(buffer, &xxs[i].len);
+ buffer = get_uint32_le_int(buffer, &xxs[i].lps);
+ buffer = get_uint32_le_int(buffer, &xxs[i].lpe);
xxs[i].flg = xxs[i].lpe > 0 ? WAVE_LOOPING : 0;
xxs[i].lpe = xxs[i].lps + xxs[i].lpe;
@@ -579,16 +605,11 @@
buffer += 32; /* Sample name */
buffer += 8; /* Sample filename */
- c2spd[i] = *((uint16 *)buffer)++;
- L_ENDIAN16 (c2spd[i]);
+ buffer = get_uint16_le_int(buffer, &c2spd[i]);
- xxs[i].len = *((uint32 *)buffer)++;
- xxs[i].lps = *((uint32 *)buffer)++;
- xxs[i].lpe = *((uint32 *)buffer)++;
-
- L_ENDIAN32 (xxs[i].len);
- L_ENDIAN32 (xxs[i].lps);
- L_ENDIAN32 (xxs[i].lpe);
+ buffer = get_uint32_le_int(buffer, &xxs[i].len);
+ buffer = get_uint32_le_int(buffer, &xxs[i].lps);
+ buffer = get_uint32_le_int(buffer, &xxs[i].lpe);
xxs[i].flg = xxs[i].lpe > 0 ? WAVE_LOOPING : 0;
xxs[i].lpe = xxs[i].lps + xxs[i].lpe;
@@ -648,12 +669,12 @@
buffer += xxs[i].len;
break;
case 1:
- len = *((uint32 *)buffer)++;
+ buffer = get_uint32_le_int(buffer, &len);
unpack_sample8 (smpbuf, buffer, xxs[i].len);
buffer += len;
break;
case 2:
- len = *((uint32 *)buffer)++;
+ buffer = get_uint32_le_int(buffer, &len);
unpack_sample16 ((uint16 *)smpbuf, buffer, xxs[i].len >> 1);
buffer += len;
break;
|
