@@ -772,8 +772,13 @@ bloops_track_str(bloopsatrack *track)
for (i = 0; i < track->nlen; i++)
{
if (ptr - str + adv + sizeof(char) * 256 > bufsize) {
+ char *new_str;
bufsize += sizeof(char) * 1024;
- realloc(str, bufsize);
+ new_str = realloc(str, bufsize);
+ if (new_str == NULL) {
+ free(str);
+ return NULL;
+ }
}
if (ptr > str)
@@ -960,7 +965,7 @@ bloops_note_freq(char note, int octave)
#define KEY(name) key = (void *)&P->name
-#line 964 "c/notation.c"
+#line 969 "c/notation.c"
static const char _bloopserial_actions[] = {
0, 1, 0, 1, 1, 1, 2, 1,
5, 1, 6, 1, 7, 1, 8, 1,
@@ -1267,7 +1272,7 @@ static const int bloopserial_error = 0;
static const int bloopserial_en_main = 142;
-#line 435 "c/notation.rl"
+#line 440 "c/notation.rl"
bloopsaphone *
@@ -1299,16 +1304,16 @@ bloops_sound_file(bloops *B, char *fname)
P = bloops_square();
-#line 1303 "c/notation.c"
+#line 1308 "c/notation.c"
{
cs = bloopserial_start;
ts = 0;
te = 0;
act = 0;
}
-#line 466 "c/notation.rl"
+#line 471 "c/notation.rl"
-#line 1312 "c/notation.c"
+#line 1317 "c/notation.c"
{
int _klen;
unsigned int _trans;
@@ -1329,7 +1334,7 @@ _resume:
#line 1 "c/notation.rl"
{ts = p;}
break;
-#line 1333 "c/notation.c"
+#line 1338 "c/notation.c"
}
}
@@ -1395,150 +1400,150 @@ _eof_trans:
switch ( *_acts++ )
{
case 0:
-#line 389 "c/notation.rl"
+#line 394 "c/notation.rl"
{
fval = ATOI(ts, p - ts) * 1.0f;
}
break;
case 1:
-#line 393 "c/notation.rl"
+#line 398 "c/notation.rl"
{
fval = ATOI(pf, p - pf) * pow(0.1f, p - pf);
}
break;
case 2:
-#line 397 "c/notation.rl"
+#line 402 "c/notation.rl"
{ pf = p; }
break;
case 3:
-#line 398 "c/notation.rl"
+#line 403 "c/notation.rl"
{ fval *= -1.0f; }
break;
case 4:
-#line 399 "c/notation.rl"
+#line 404 "c/notation.rl"
{ KEY(volume); }
break;
case 5:
-#line 400 "c/notation.rl"
+#line 405 "c/notation.rl"
{ KEY(arp); }
break;
case 6:
-#line 401 "c/notation.rl"
+#line 406 "c/notation.rl"
{ KEY(aspeed); }
break;
case 7:
-#line 402 "c/notation.rl"
+#line 407 "c/notation.rl"
{ KEY(attack); }
break;
case 8:
-#line 403 "c/notation.rl"
+#line 408 "c/notation.rl"
{ KEY(decay); }
break;
case 9:
-#line 404 "c/notation.rl"
+#line 409 "c/notation.rl"
{ KEY(dslide); }
break;
case 10:
-#line 405 "c/notation.rl"
+#line 410 "c/notation.rl"
{ KEY(freq); }
break;
case 11:
-#line 406 "c/notation.rl"
+#line 411 "c/notation.rl"
{ KEY(hpf); }
break;
case 12:
-#line 407 "c/notation.rl"
+#line 412 "c/notation.rl"
{ KEY(hsweep); }
break;
case 13:
-#line 408 "c/notation.rl"
+#line 413 "c/notation.rl"
{ KEY(limit); }
break;
case 14:
-#line 409 "c/notation.rl"
+#line 414 "c/notation.rl"
{ KEY(lpf); }
break;
case 15:
-#line 410 "c/notation.rl"
+#line 415 "c/notation.rl"
{ KEY(lsweep); }
break;
case 16:
-#line 411 "c/notation.rl"
+#line 416 "c/notation.rl"
{ KEY(phase); }
break;
case 17:
-#line 412 "c/notation.rl"
+#line 417 "c/notation.rl"
{ KEY(psweep); }
break;
case 18:
-#line 413 "c/notation.rl"
+#line 418 "c/notation.rl"
{ KEY(repeat); }
break;
case 19:
-#line 414 "c/notation.rl"
+#line 419 "c/notation.rl"
{ KEY(resonance); }
break;
case 20:
-#line 415 "c/notation.rl"
+#line 420 "c/notation.rl"
{ KEY(slide); }
break;
case 21:
-#line 416 "c/notation.rl"
+#line 421 "c/notation.rl"
{ KEY(square); }
break;
case 22:
-#line 417 "c/notation.rl"
+#line 422 "c/notation.rl"
{ KEY(sustain); }
break;
case 23:
-#line 418 "c/notation.rl"
+#line 423 "c/notation.rl"
{ KEY(sweep); }
break;
case 24:
-#line 419 "c/notation.rl"
+#line 424 "c/notation.rl"
{ KEY(punch); }
break;
case 25:
-#line 420 "c/notation.rl"
+#line 425 "c/notation.rl"
{ KEY(vibe); }
break;
case 26:
-#line 421 "c/notation.rl"
+#line 426 "c/notation.rl"
{ KEY(vspeed); }
break;
case 27:
-#line 422 "c/notation.rl"
+#line 427 "c/notation.rl"
{ KEY(vdelay); }
break;
case 28:
-#line 423 "c/notation.rl"
+#line 428 "c/notation.rl"
{ KEY(volume); }
break;
case 31:
-#line 427 "c/notation.rl"
+#line 432 "c/notation.rl"
{te = p+1;{ P->type = BLOOPS_SQUARE; }}
break;
case 32:
-#line 428 "c/notation.rl"
+#line 433 "c/notation.rl"
{te = p+1;{ P->type = BLOOPS_SAWTOOTH; }}
break;
case 33:
-#line 429 "c/notation.rl"
+#line 434 "c/notation.rl"
{te = p+1;{ P->type = BLOOPS_SINE; }}
break;
case 34:
-#line 430 "c/notation.rl"
+#line 435 "c/notation.rl"
{te = p+1;{ P->type = BLOOPS_NOISE; }}
break;
case 35:
-#line 426 "c/notation.rl"
+#line 431 "c/notation.rl"
{te = p;p--;{ *((float *)key) = fval; }}
break;
case 36:
-#line 431 "c/notation.rl"
+#line 436 "c/notation.rl"
{te = p;p--;}
break;
-#line 1542 "c/notation.c"
+#line 1547 "c/notation.c"
}
}
@@ -1551,7 +1556,7 @@ _again:
#line 1 "c/notation.rl"
{ts = 0;}
break;
-#line 1555 "c/notation.c"
+#line 1560 "c/notation.c"
}
}
@@ -1570,7 +1575,7 @@ _again:
_out: {}
}
-#line 467 "c/notation.rl"
+#line 472 "c/notation.rl"
done:
fclose(fp);
c/notation.c
@@ -192,8 +192,13 @@ bloops_track_str(bloopsatrack *track)
for (i = 0; i < track->nlen; i++)
{
if (ptr - str + adv + sizeof(char) * 256 > bufsize) {
+ char *new_str;
bufsize += sizeof(char) * 1024;
- realloc(str, bufsize);
+ new_str = realloc(str, bufsize);
+ if (new_str == NULL) {
+ free(str);
+ return NULL;
+ }
}
if (ptr > str)
c/notation.rl
68b0b4ab47f7c3edd977aa3aff49031d91d69bca
MenTaLguY
mental@rydia.net
http://github.com/localhost/bloopsaphone/commit/e579e2d1a493c6f98c32f983703edda86d4a9483
e579e2d1a493c6f98c32f983703edda86d4a9483
2009-07-30T18:51:59-07:00
2009-06-26T22:39:54-07:00
address heap corruption in notation
Signed-off-by: why the lucky stiff <why@whytheluckystiff.net>
8ba42cbf4d736ddf5cff20e43d93ef71a6ef4dc0
Alex Brem
alex@fluktuation.net