--- parser3/src/main/pa_string.C 2001/02/22 10:43:46 1.30 +++ parser3/src/main/pa_string.C 2001/03/18 13:38:48 1.41 @@ -1,5 +1,9 @@ /* - $Id: pa_string.C,v 1.30 2001/02/22 10:43:46 paf Exp $ + Parser + Copyright (c) 2001 ArtLebedev Group (http://www.artlebedev.com) + Author: Alexander Petrosyan (http://design.ru/paf) + + $Id: pa_string.C,v 1.41 2001/03/18 13:38:48 paf Exp $ */ #include @@ -11,7 +15,7 @@ // String -String::String(Pool& apool) : +String::String(Pool& apool, const char *src, bool tainted) : Pooled(apool) { last_chunk=&head; head.count=CR_PREALLOCATED_COUNT; @@ -19,6 +23,12 @@ String::String(Pool& apool) : head.preallocated_link=0; link_row=&head.rows[head.count]; fused_rows=fsize=0; + + if(src) + if(tainted) + APPEND_TAINTED(src, 0, 0, 0); + else + APPEND(src, 0, 0, 0); } void String::expand() { @@ -32,8 +42,7 @@ void String::expand() { link_row->link=0; } -String::String(const String& src) : - Pooled(src.pool()) { +String::String(const String& src) : Pooled(src.pool()) { head.count=CR_PREALLOCATED_COUNT; int src_used_rows=src.used_rows(); @@ -90,16 +99,17 @@ String::String(const String& src) : fsize=src.fsize; } -String& String::operator += (const String& src) { +String& String::append(const String& src, Untaint_lang lang) { int src_used_rows=src.used_rows(); int dst_free_rows=link_row-append_here; if(src_used_rows<=dst_free_rows) { // all new rows fit into last chunk memcpy(append_here, src.head.rows, sizeof(Chunk::Row)*src_used_rows); + set_lang(append_here, lang, src_used_rows); append_here+=src_used_rows; } else { - // not all new rows don't fit into last chunk: shrinking it to used part, + // not all new rows fit into last chunk: shrinking it to used part, int used_rows=last_chunk->count-dst_free_rows; //int *countp=append_here link_row=&last_chunk->rows[last_chunk->count=used_rows]; @@ -111,7 +121,7 @@ String& String::operator += (const Strin link_row->link=last_chunk; append_here=link_row=&last_chunk->rows[src_used_rows]; - Chunk *old_chunk=src.head.preallocated_link; + const Chunk *old_chunk=&src.head; Chunk::Row *new_rows=last_chunk->rows; int rows_left_to_copy=src_used_rows; while(true) { @@ -121,6 +131,7 @@ String& String::operator += (const Strin // not last source chunk // taking it all memcpy(new_rows, old_chunk->rows, sizeof(Chunk::Row)*old_count); + set_lang(new_rows, lang, old_count); new_rows+=old_count; rows_left_to_copy-=old_count; @@ -129,6 +140,7 @@ String& String::operator += (const Strin // the last source chunk // taking only those rows of chunk that _left_to_copy memcpy(new_rows, old_chunk->rows, sizeof(Chunk::Row)*rows_left_to_copy); + set_lang(new_rows, lang, rows_left_to_copy); break; } } @@ -139,6 +151,33 @@ String& String::operator += (const Strin return *this; } +void String::set_lang(Chunk::Row *row, Untaint_lang lang, size_t size) { + if(lang==PASS_APPEND) + return; + + while(size--) { + Untaint_lang& item_lang=(row++)->item.lang; + if(item_lang==YES) // tainted? need untaint language assignment + item_lang=lang; // assign untaint language + } +} + +void String::change_lang(Untaint_lang lang) { + Chunk *chunk=&head; + do { + Chunk::Row *row=chunk->rows; + for(int i=0; icount; i++) { + if(row==append_here) + goto break2; + + row->item.lang=lang; + row++; + } + chunk=row->link; + } while(chunk); +break2: + return; +} String& String::real_append(STRING_APPEND_PARAMS) { if(!src) @@ -153,6 +192,7 @@ String& String::real_append(STRING_APPEN append_here->item.ptr=src; fsize+=append_here->item.size=size; + append_here->item.lang=tainted?YES:NO; #ifndef NO_STRING_ORIGIN append_here->item.origin.file=file; append_here->item.origin.line=line; @@ -162,28 +202,6 @@ String& String::real_append(STRING_APPEN return *this; } -char *String::cstr() const { - char *result=static_cast(malloc(size()+1)); - - char *copy_here=result; - const Chunk *chunk=&head; - do { - const Chunk::Row *row=chunk->rows; - for(int i=0; icount; i++) { - if(row==append_here) - goto break2; - - memcpy(copy_here, row->item.ptr, row->item.size); - copy_here+=row->item.size; - row++; - } - chunk=row->link; - } while(chunk); -break2: - *copy_here=0; - return result; -} - uint String::hash_code() const { uint result=0; @@ -203,10 +221,7 @@ break2: return result; } -bool String::operator == (const String& src) const { - if(size() != src.size()) - return false; - +int String::cmp(const String& src) const { const Chunk *a_chunk=&head; const Chunk *b_chunk=&src.head; const Chunk::Row *a_row=a_chunk->rows; @@ -219,33 +234,37 @@ bool String::operator == (const String& int b_countdown=b_chunk->count; bool a_break=false; bool b_break=false; + int result; while(true) { + a_break=a_row==a_end; + b_break=b_row==b_end; + if(a_break || b_break) + break; + int size_diff= (a_row->item.size-a_offset)- (b_row->item.size-b_offset); if(size_diff==0) { // a has same size as b - if(memcmp(a_row->item.ptr+a_offset, b_row->item.ptr+b_offset, a_row->item.size-a_offset)!=0) - return false; + result=memcmp(a_row->item.ptr+a_offset, b_row->item.ptr+b_offset, a_row->item.size-a_offset); + if(result) + return result; a_row++; a_countdown--; a_offset=0; b_row++; b_countdown--; b_offset=0; } else if (size_diff>0) { // a longer - if(memcmp(a_row->item.ptr+a_offset, b_row->item.ptr+b_offset, b_row->item.size-b_offset)!=0) - return false; + result=memcmp(a_row->item.ptr+a_offset, b_row->item.ptr+b_offset, b_row->item.size-b_offset); + if(result) + return result; a_offset+=b_row->item.size-b_offset; b_row++; b_countdown--; b_offset=0; } else { // b longer - if(memcmp(a_row->item.ptr+a_offset, b_row->item.ptr+b_offset, a_row->item.size-a_offset)!=0) - return false; + result=memcmp(a_row->item.ptr+a_offset, b_row->item.ptr+b_offset, a_row->item.size-a_offset); + if(result) + return result; b_offset+=a_row->item.size-a_offset; a_row++; a_countdown--; a_offset=0; } - a_break=a_row==a_end; - b_break=b_row==b_end; - if(a_break || b_break) - break; - if(!a_countdown) { a_chunk=a_row->link; a_row=a_chunk->rows; @@ -257,10 +276,16 @@ bool String::operator == (const String& b_countdown=b_chunk->count; } } - return a_break==b_break; + if(a_break==b_break) // ended simultaneously + result=0; + else if(a_break) // first bytes equal, but a ended before b + result=-1; + else + result=+1; + return result; } -bool String::operator == (char* b_ptr) const { +bool String::operator == (const char* b_ptr) const { size_t b_size=b_ptr?strlen(b_ptr):0; if(size() != b_size) return false;