Some memory leaks and out of bounds array access fixed (#4498)

This commit is contained in:
Damjan Adamic
2017-02-26 12:39:26 +01:00
committed by Bertrand Songis
parent 1910af51b6
commit 7081f924de
7 changed files with 35 additions and 31 deletions
+1
View File
@@ -116,6 +116,7 @@ int cliLs(const char ** argv)
if (res != FR_OK || fno.fname[0] == 0) break; /* Break on error or end of dir */
serialPrint(fno.fname);
}
f_closedir(&dir);
}
else {
serialPrint("%s: Invalid directory \"%s\"", argv[0], argv[1]);
@@ -323,6 +323,7 @@ bool menuRadioSdManager(event_t _event)
}
}
}
f_closedir(&dir);
}
}
+1
View File
@@ -370,6 +370,7 @@ void drawSleepBitmap()
const BitmapBuffer * bitmap = BitmapBuffer::load(getThemePath("sleep.bmp"));
if (bitmap) {
lcd->drawBitmap((LCD_W-bitmap->getWidth())/2, (LCD_H-bitmap->getHeight())/2, bitmap);
delete bitmap;
}
lcdRefresh();
}
@@ -384,6 +384,7 @@ void menuRadioSdManager(event_t _event)
}
}
}
f_closedir(&dir);
}
}
+1
View File
@@ -362,6 +362,7 @@ bool sdListFiles(const char * path, const char * extension, const uint8_t maxlen
}
}
}
f_closedir(&dir);
}
if (popupMenuOffset > 0)
+29 -30
View File
@@ -678,45 +678,44 @@ void RlcFile::nextRlcWriteStep()
return;
}
bool run0 = (m_rlc_buf[0] == 0);
if (m_rlc_len>0) {
if (m_rlc_len==0) goto close;
bool run0 = (m_rlc_buf[0] == 0);
for (i=1; 1; i++) { // !! laeuft ein byte zu weit !!
bool cur0 = m_rlc_buf[i] == 0;
if (cur0 != run0 || cnt==0x3f || (cnt0 && cnt==0x0f) || i==m_rlc_len) {
if (run0) {
assert(cnt0==0);
if (cnt<8 && i!=m_rlc_len)
cnt0 = cnt; //aufbew fuer spaeter
for (i=1; 1; i++) { // !! laeuft ein byte zu weit !!
bool cur0 = (i<m_rlc_len) ? (m_rlc_buf[i] == 0) : false;
if (cur0 != run0 || cnt==0x3f || (cnt0 && cnt==0x0f) || i==m_rlc_len) {
if (run0) {
assert(cnt0==0);
if (cnt<8 && i!=m_rlc_len)
cnt0 = cnt; //aufbew fuer spaeter
else {
m_rlc_buf+=cnt;
m_rlc_len-=cnt;
write1(cnt|0x40);
return;
}
}
else {
m_rlc_buf+=cnt;
m_rlc_len-=cnt;
write1(cnt|0x40);
m_rlc_buf+=cnt0;
m_rlc_len-=cnt0+cnt;
m_cur_rlc_len=cnt;
if(cnt0){
write1(0x80 | (cnt0<<4) | cnt);
}
else{
write1(cnt);
}
return;
}
cnt=0;
if (i==m_rlc_len) break;
run0 = cur0;
}
else {
m_rlc_buf+=cnt0;
m_rlc_len-=cnt0+cnt;
m_cur_rlc_len=cnt;
if(cnt0){
write1(0x80 | (cnt0<<4) | cnt);
}
else{
write1(cnt);
}
return;
}
cnt=0;
if (i==m_rlc_len) break;
run0 = cur0;
cnt++;
}
cnt++;
}
close:
switch(m_write_step) {
case WRITE_START_STEP: {
blkid_t fri = 0;
+1 -1
View File
@@ -36,7 +36,7 @@ unsigned int compress(uint8_t * dst, unsigned int dstsize, const uint8_t * src,
uint8_t cnt0 = 0;
for (unsigned int i=1; 1; i++) {
bool cur0 = (src[i] == 0);
bool cur0 = (i < srcsize) ? (src[i] == 0) : false;
if (i==srcsize || cur0!=run0 || cnt==0x3f || (cnt0 && cnt==0xf)) {
if (run0) {
assert(cnt0==0);