devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

logf: Fix two issues with logf_panic_dump()

Browse source 
* It had a (read) buffer overflow when dumping the stuff on the back half of the buffer
 * a highly questionable code construct was nuked

Change-Id: I7f6f119524fc2095f788fc9b3d356459955d3ace
This commit is contained in:
Solomon Peachy 2021-08-06 09:56:22 -04:00
parent da45b37fac
commit 835d0c737a
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
firmware/export/logf.h
View file

@ -31,7 +31,7 @@
#define MAX_LOGF_SIZE 16384 #define MAX_LOGF_SIZE 16384
extern unsigned char logfbuffer[MAX_LOGF_SIZE]; extern unsigned char logfbuffer[MAX_LOGF_SIZE + 1];
extern int logfindex; extern int logfindex;
extern bool logfwrap; extern bool logfwrap;
extern bool logfenabled; extern bool logfenabled;

11
firmware/logf.c
View file

@ -61,7 +61,7 @@ static int logdiskfindex;
#ifdef ROCKBOX_HAS_LOGF #ifdef ROCKBOX_HAS_LOGF
#ifndef __PCTOOL__ #ifndef __PCTOOL__
unsigned char logfbuffer[MAX_LOGF_SIZE]; unsigned char logfbuffer[MAX_LOGF_SIZE + 1];
int logfindex; int logfindex;
bool logfwrap; bool logfwrap;
bool logfenabled = true; bool logfenabled = true;
@ -272,10 +272,14 @@ void logf_panic_dump(int *y)
return; return;
} }
/* Explicitly null-terminate our buffer */
logfbuffer[MAX_LOGF_SIZE] = 0;
lcd_puts(1, (*y)++, "start of logf data"); lcd_puts(1, (*y)++, "start of logf data");
lcd_update(); lcd_update();
i = logfindex - 2; /* The last actual characer (i.e. not '\0') */
/* The intent is to dump the newest log entries first! */
i = logfindex - 2; /* The last actual characer (i.e. not '\0') */
while(i >= 0) while(i >= 0)
{ {
while(logfbuffer[i] != 0 && i>=0) while(logfbuffer[i] != 0 && i>=0)
@ -300,12 +304,13 @@ void logf_panic_dump(int *y)
} }
if(strlen( &logfbuffer[i + 1]) > 0) if(strlen( &logfbuffer[i + 1]) > 0)
{ {
lcd_putsf(1, (*y)++, "%*s", (MAX_LOGF_SIZE-i) &logfbuffer[i + 1]); lcd_putsf(1, (*y)++, "%*s", &logfbuffer[i + 1]);
lcd_update(); lcd_update();
} }
} }
i--; i--;
} }
lcd_puts(1, (*y)++, "end of logf data"); lcd_puts(1, (*y)++, "end of logf data");
lcd_update(); lcd_update();
} }