wilderjds
/
xmp-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix out-of-bounds read of mod->xxs, constify xmp_module_info pointers.

Browse Source
master
AliceLR 5 years ago committed by Ozkan Sezer
parent 22f92ed569
commit ecd0820b9e
4 changed files with 47 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/commands.c
  2. 14
      src/common.h
  3. 54
      src/info.c
  4. 4
      src/main.c

4
src/commands.c
Unescape View File

@ -97,7 +97,7 @@ static int read_key(void)
return key;
}
static void change_sequence(xmp_context handle, struct xmp_module_info *mi, struct control *ctl, int i)
static void change_sequence(xmp_context handle, const struct xmp_module_info *mi, struct control *ctl, int i)
{
int seq = ctl->sequence;
@ -126,7 +126,7 @@ static void change_sequence(xmp_context handle, struct xmp_module_info *mi, stru
* ESC [ C - right arrow
* ESC [ D - left arrow
*/
void read_command(xmp_context handle, struct xmp_module_info *mi, struct control *ctl)
void read_command(xmp_context handle, const struct xmp_module_info *mi, struct control *ctl)
{
int cmd;

14
src/common.h
Unescape View File

@ -89,17 +89,17 @@ int set_tty(void);
int reset_tty(void);
/* info */
void info_mod(struct xmp_module_info *, int);
void info_mod(const struct xmp_module_info *, int);
void info_message(const char *, ...);
void info_frame_init(void);
void info_frame(struct xmp_module_info *, struct xmp_frame_info *, struct control *, int);
void info_ins_smp(struct xmp_module_info *);
void info_instruments(struct xmp_module_info *);
void info_samples(struct xmp_module_info *);
void info_comment(struct xmp_module_info *);
void info_frame(const struct xmp_module_info *, const struct xmp_frame_info *, struct control *, int);
void info_ins_smp(const struct xmp_module_info *);
void info_instruments(const struct xmp_module_info *);
void info_samples(const struct xmp_module_info *);
void info_comment(const struct xmp_module_info *);
void info_help(void);
/* commands */
void read_command(xmp_context, struct xmp_module_info *, struct control *);
void read_command(xmp_context, const struct xmp_module_info *, struct control *);
#endif

54
src/info.c
Unescape View File

@ -42,7 +42,7 @@ void info_help(void)
);
}
void info_mod(struct xmp_module_info *mi, int mode)
void info_mod(const struct xmp_module_info *mi, int mode)
{
int i;
int num_seq;
@ -141,7 +141,7 @@ static void fix_info_02x(int val, char *buf)
}
}
void info_frame(struct xmp_module_info *mi, struct xmp_frame_info *fi, struct control *ctl, int reprint)
void info_frame(const struct xmp_module_info *mi, const struct xmp_frame_info *fi, struct control *ctl, int reprint)
{
static int ord = -1, spd = -1, bpm = -1;
char rowstr[3], numrowstr[3];
@ -226,15 +226,16 @@ void info_frame(struct xmp_module_info *mi, struct xmp_frame_info *fi, struct co
fflush(stdout);
}
void info_ins_smp(struct xmp_module_info *mi)
void info_ins_smp(const struct xmp_module_info *mi)
{
int i, j;
struct xmp_module *mod = mi->mod;
const struct xmp_module *mod = mi->mod;
report("Instruments and samples:\n");
report(" Instrument name Smp Size Loop End Vol Fine Xpo Pan\n");
for (i = 0; i < mod->ins; i++) {
struct xmp_instrument *ins = &mod->xxi[i];
int has_sub = 0;
if (strlen(ins->name) == 0 && ins->nsm == 0) {
continue;
@ -243,8 +244,15 @@ void info_ins_smp(struct xmp_module_info *mi)
report("%02x %-32.32s ", i + 1, ins->name);
for (j = 0; j < ins->nsm; j++) {
struct xmp_subinstrument *sub = &ins->sub[j];
struct xmp_sample *smp = &mod->xxs[sub->sid];
const struct xmp_subinstrument *sub = &ins->sub[j];
const struct xmp_sample *smp;
/* Some instruments reference samples that don't exist
* (see beek-substitutionology.it). */
if (sub->sid >= mod->smp) {
continue;
}
smp = &mod->xxs[sub->sid];
if (j > 0) {
if (smp->len == 0) {
@ -253,6 +261,7 @@ void info_ins_smp(struct xmp_module_info *mi)
report("%36.36s", " ");
}
has_sub = 1;
report("[%02x] %05x%c%05x %05x%c V%02x %+04d %+03d P%02x\n",
sub->sid + 1,
smp->len,
@ -268,21 +277,22 @@ void info_ins_smp(struct xmp_module_info *mi)
sub->pan & 0xff);
}
if (j == 0) {
if (has_sub == 0) {
report("[ ] ----- ----- ----- --- ---- --- ---\n");
}
}
}
void info_instruments(struct xmp_module_info *mi)
void info_instruments(const struct xmp_module_info *mi)
{
int i, j;
struct xmp_module *mod = mi->mod;
const struct xmp_module *mod = mi->mod;
report("Instruments:\n");
report(" Instrument name Vl Fade Env Ns Sub Gv Vl Fine Xpo Pan Sm\n");
for (i = 0; i < mod->ins; i++) {
struct xmp_instrument *ins = &mod->xxi[i];
const struct xmp_instrument *ins = &mod->xxi[i];
int has_sub = 0;
if (strlen(ins->name) == 0 && ins->nsm == 0) {
continue;
@ -297,16 +307,24 @@ void info_instruments(struct xmp_module_info *mi)
);
for (j = 0; j < ins->nsm; j++) {
struct xmp_subinstrument *sub = &ins->sub[j];
struct xmp_sample *smp = &mod->xxs[sub->sid];
const struct xmp_subinstrument *sub = &ins->sub[j];
const struct xmp_sample *smp;
if (j > 0) {
/* Some instruments reference samples that don't exist
* (see beek-substitutionology.it). */
if (sub->sid >= mod->smp) {
continue;
}
smp = &mod->xxs[sub->sid];
if (smp->len == 0) {
continue;
}
report("%51.51s", " ");
}
has_sub = 1;
report("[%02x] %02x %02x %+04d %+03d P%02x %02x\n",
j + 1,
sub->gvl,
@ -317,21 +335,21 @@ void info_instruments(struct xmp_module_info *mi)
sub->sid);
}
if (j == 0) {
if (has_sub == 0) {
report("[ ] -- -- ---- --- --- --\n");
}
}
}
void info_samples(struct xmp_module_info *mi)
void info_samples(const struct xmp_module_info *mi)
{
int i;
struct xmp_module *mod = mi->mod;
const struct xmp_module *mod = mi->mod;
report("Samples:\n");
report(" Sample name Length Start End Flags\n");
for (i = 0; i < mod->smp; i++) {
struct xmp_sample *smp = &mod->xxs[i];
const struct xmp_sample *smp = &mod->xxs[i];
if (strlen(smp->name) == 0 && smp->len == 0) {
continue;
@ -348,7 +366,7 @@ void info_samples(struct xmp_module_info *mi)
}
}
void info_comment(struct xmp_module_info *mi)
void info_comment(const struct xmp_module_info *mi)
{
char *c = mi->comment;
@ -364,6 +382,6 @@ void info_comment(struct xmp_module_info *mi)
break;
report("%c", *c);
} while (*c++ != '\n');
}
}
report("\n\n");
}

4
src/main.c
Unescape View File

@ -114,7 +114,7 @@ static void sigcont_handler(int sig)
}
#endif
static void show_info(int what, struct xmp_module_info *mi, int mode)
static void show_info(int what, const struct xmp_module_info *mi, int mode)
{
report("\r%78.78s\n", " ");
switch (what) {
@ -153,7 +153,7 @@ static void shuffle(int argc, char **argv)
}
static void check_pause(xmp_context xc, struct control *ctl,
struct xmp_module_info *mi, struct xmp_frame_info *fi, int verbose)
const struct xmp_module_info *mi, const struct xmp_frame_info *fi, int verbose)
{
if (ctl->pause) {
sound->pause();

Write Preview
Loading…
Cancel
Save