From 06bba740f0085bcd6262cece62dcff266d8efe95 Mon Sep 17 00:00:00 2001 From: Arch Librarian Date: Mon, 20 Sep 2004 16:52:55 +0000 Subject: Fixed another parser glitch Author: jgg Date: 1999-02-22 03:30:06 GMT Fixed another parser glitch --- apt-pkg/tagfile.cc | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'apt-pkg/tagfile.cc') diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index 5d45b59bc..53e1e5e8b 100644 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: tagfile.cc,v 1.23 1999/02/21 08:38:53 jgg Exp $ +// $Id: tagfile.cc,v 1.24 1999/02/22 03:30:06 jgg Exp $ /* ###################################################################### Fast scanner for RFC-822 type header information @@ -127,8 +127,11 @@ bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long Offset) return false; if (Tag.Scan(Start,End - Start) == false) + { + cout << string(Start,End) << endl; return _error->Error("Unable to parse package file %s (2)",Fd.Name().c_str()); - + } + return true; } /*}}}*/ @@ -212,9 +215,12 @@ bool pkgTagSection::Find(const char *Tag,const char *&Start, // Strip off the gunk from the start end Start = C; End = Section + Indexes[I+1]; + if (Start >= End) + return _error->Error("Internal parsing error"); + for (; (isspace(*Start) != 0 || *Start == ':') && Start < End; Start++); for (; isspace(End[-1]) != 0 && End > Start; End--); - + return true; } @@ -286,5 +292,3 @@ bool pkgTagSection::FindFlag(const char *Tag,unsigned long &Flags, return true; } /*}}}*/ - - -- cgit v1.2.3