merge from open-source master

Change-Id: I408b5705b18d9e93e66bfbfeec0e3baefd618dec
This commit is contained in:
The Android Open Source Project 2010-06-18 11:33:00 -07:00
commit e8f79c1f5d

View File

@ -317,7 +317,7 @@ line_parser_addc( LineParser* p, int c )
static int
line_parser_getc( LineParser* p )
{
if (p->in_len >= p->in_pos) {
if (p->in_pos >= p->in_len) {
int ret;
p->in_len = p->in_pos = 0;