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

FS#12132 patch 8: retrieve_entries: Decrease binsize by reenabling

Browse source 
inlining format_str() and avoiding a string copy by printing directly
into the name buffer.

Also uses quite a bit less stack space.

En passant, made basename printing more robust by not limiting the
buffer into which the file pathname is fetched by the max size of the
resulting basename string.  Also, fixed a potential buffer overrun in
format_str.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30248 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Hohmuth 2011-08-04 10:23:18 +00:00
parent e7c2449d07
commit 8207a4a267
1 changed files with 34 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

61
apps/tagtree.c
View file

@ -1096,10 +1096,10 @@ static int format_str(struct tagcache_search *tcs, struct display_format *fmt,
}
}
char formatchar = fmt->formatstr[i];
if (read_format)
{
char formatchar = fmt->formatstr[i];
fmtbuf[fmtbuf_pos++] = formatchar;
if (fmtbuf_pos >= sizeof fmtbuf)
{
@ -1110,7 +1110,7 @@ static int format_str(struct tagcache_search *tcs, struct display_format *fmt,
if (formatchar == 's' || formatchar == 'd')
{
unsigned space_left = buf_size - buf_pos;
char tmpbuf[space_left + 1];
char tmpbuf[MAX_PATH];
char *result;
fmtbuf[fmtbuf_pos] = '\0';
@ -1131,7 +1131,7 @@ static int format_str(struct tagcache_search *tcs, struct display_format *fmt,
if (!tagcache_retrieve(tcs, tcs->idx_id,
(tag == tag_virt_basename ?
tag_filename : tag),
tmpbuf, space_left))
tmpbuf, sizeof tmpbuf))
{
logf("retrieve failed");
return -3;
@ -1145,22 +1145,23 @@ static int format_str(struct tagcache_search *tcs, struct display_format *fmt,
else
result = tmpbuf;
}
snprintf(&buf[buf_pos], space_left, fmtbuf, result);
buf_pos +=
snprintf(&buf[buf_pos], space_left, fmtbuf, result);
break;
case 'd':
snprintf(&buf[buf_pos], space_left, fmtbuf,
tagcache_get_numeric(tcs, fmt->tags[parpos]));
buf_pos +=
snprintf(&buf[buf_pos], space_left, fmtbuf,
tagcache_get_numeric(tcs, fmt->tags[parpos]));
}
buf_pos += strlen(&buf[buf_pos]);
parpos++;
}
}
else
buf[buf_pos++] = fmt->formatstr[i];
buf[buf_pos++] = formatchar;
if (buf_pos - 1 >= buf_size)
if (buf_pos >= buf_size - 1) /* need at least one more byte for \0 */
{
logf("buffer overflow");
return -4;
@ -1328,35 +1329,41 @@ static int retrieve_entries(struct tree_context *c, int offset, bool init)
if (!tcs.ramresult || fmt)
{
char buf[MAX_PATH];
dptr->name = &c->cache.name_buffer[namebufused];
if (fmt)
{
if (format_str(&tcs, fmt, buf, sizeof buf) < 0)
int ret = format_str(&tcs, fmt, dptr->name,
c->cache.name_buffer_size - namebufused);
if (ret == -4) /* buffer full */
{
logf("chunk mode #2: %d", current_entry_count);
c->dirfull = true;
sort = false;
break ;
}
else if (ret < 0)
{
logf("format_str() failed");
tagcache_search_finish(&tcs);
return 0;
}
else
namebufused += strlen(dptr->name)+1;
}
dptr->name = &c->cache.name_buffer[namebufused];
if (fmt)
namebufused += strlen(buf)+1;
else
namebufused += tcs.result_len;
if (namebufused >= c->cache.name_buffer_size)
{
logf("chunk mode #2: %d", current_entry_count);
c->dirfull = true;
sort = false;
break ;
namebufused += tcs.result_len;
if (namebufused < c->cache.name_buffer_size)
strcpy(dptr->name, tcs.result);
else
{
logf("chunk mode #2a: %d", current_entry_count);
c->dirfull = true;
sort = false;
break ;
}
}
if (fmt)
strcpy(dptr->name, buf);
else
strcpy(dptr->name, tcs.result);
}
else
dptr->name = tcs.result;