diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-01-21 22:58:04 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2019-01-21 22:58:04 +0000 |
| commit | a9647bf912b9d2eeb9297bb96d5274eb8c9ed75c (patch) | |
| tree | 805b10a222dd770260a63a4af45cdde56018196b | |
| parent | 44f4e4182bb7954a117781e7f4f658af69dec3fd (diff) | |
| download | gcc-a9647bf912b9d2eeb9297bb96d5274eb8c9ed75c.zip gcc-a9647bf912b9d2eeb9297bb96d5274eb8c9ed75c.tar.gz gcc-a9647bf912b9d2eeb9297bb96d5274eb8c9ed75c.tar.bz2 | |
compiler: stop iterator on error
If there is an error reading or parsing an archive header, the
Archive_iterator code would return a dummy header but would not mark
itself as done. The effect is that an invalid archive leads to an
endless loop reading and re-reading the same archive header. Avoid
that by setting the offset to the end of the file, which will cause
the iterator to == archive_end.
No test since it doesn't seem worth constructing an invalid archive.
Reviewed-on: https://go-review.googlesource.com/c/158217
From-SVN: r268129
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | gcc/go/gofrontend/import-archive.cc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 3c1d270..c5b51b7 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -c76ba3014e42cc6adc3d43709bba28c5ad7a6ba2 +e7427654f3af83e1feea727a62a97172d7721403 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/gcc/go/gofrontend/import-archive.cc b/gcc/go/gofrontend/import-archive.cc index a6d5403..868def7 100644 --- a/gcc/go/gofrontend/import-archive.cc +++ b/gcc/go/gofrontend/import-archive.cc @@ -780,6 +780,7 @@ Archive_iterator::read_next_header() &this->next_off_)) { this->header_.off = filesize; + this->off_ = filesize; return; } this->header_.off = this->off_; |