# HG changeset patch # User reimar # Date 1230802525 0 # Node ID 26ab2d01157f16d9778a59810a878760ce3510f6 # Parent a02653498c15b33f661022f14ebe4dfe29bca0a0 Add asserts to detect when assumptions for play_tree_parser_get_line fail (mostly due to parsers using it incorrectly). diff -r a02653498c15 -r 26ab2d01157f playtreeparser.c --- a/playtreeparser.c Wed Dec 31 14:21:50 2008 +0000 +++ b/playtreeparser.c Thu Jan 01 09:35:25 2009 +0000 @@ -6,9 +6,7 @@ #include #include #include -#ifdef MP_DEBUG #include -#endif #include #include #include @@ -61,6 +59,8 @@ if(p->stream->eof && (p->buffer_end == 0 || p->iter[0] == '\0')) return NULL; + assert(p->buffer_end < p->buffer_size); + assert(!p->buffer[p->buffer_end]); while(1) { if(resize) { @@ -75,10 +75,12 @@ r = stream_read(p->stream,p->buffer + p->buffer_end,p->buffer_size - p->buffer_end - 1); if(r > 0) { p->buffer_end += r; + assert(p->buffer_end < p->buffer_size); p->buffer[p->buffer_end] = '\0'; while(strlen(p->buffer + p->buffer_end - r) != r) p->buffer[p->buffer_end - r + strlen(p->buffer + p->buffer_end - r)] = '\n'; } + assert(!p->buffer[p->buffer_end]); } end = strchr(p->iter,'\n');