Merge remote-tracking branch 'origin/topic/timw/const-cast-zip'

* origin/topic/timw/const-cast-zip:
  GH-2009: Use auto to fix ZIP analyzer failure on some platforms
This commit is contained in:
Tim Wojtulewicz 2022-04-04 10:51:20 -07:00
commit 1b67464d25
3 changed files with 6 additions and 2 deletions

View file

@ -1,3 +1,7 @@
5.0.0-dev.212 | 2022-04-04 10:51:20 -0700
* GH-2009: Use auto to fix ZIP analyzer failure on some platforms (Tim Wojtulewicz, Corelight)
5.0.0-dev.210 | 2022-03-28 17:04:51 -0700
* Add cmake-time reporting of bifcl, binpac, and gen-zam used for build (Christian Kreibich, Corelight)

View file

@ -1 +1 @@
5.0.0-dev.210
5.0.0-dev.212

View file

@ -59,7 +59,7 @@ void ZIP_Analyzer::DeliverStream(int len, const u_char* data, bool orig)
zip->next_in = (Bytef*)data;
zip->avail_in = len;
Bytef* orig_next_in = zip->next_in;
auto orig_next_in = zip->next_in;
size_t orig_avail_in = zip->avail_in;
while ( true )