From: Steinar H. Gunderson Date: Thu, 6 Jun 2013 00:21:46 +0000 (+0200) Subject: (Hopefully) fix an assert failure in httpinput.cpp. X-Git-Tag: 1.0.0~33 X-Git-Url: https://git.sesse.net/?p=cubemap;a=commitdiff_plain;h=ff78f87ecc83e472f8c649eb0b8503a483e393ff (Hopefully) fix an assert failure in httpinput.cpp. If we get the Metacube sync marker but not the right of the header, we can set has_metacube_header, and then return. If the connection drops right there, the flag won't be correctly reset, and if the next connection starts with something that's not a Metacube block, we will try to read junk data as Metacube. Thankfully, the assert caught this case. --- diff --git a/httpinput.cpp b/httpinput.cpp index 19167f0..275df50 100644 --- a/httpinput.cpp +++ b/httpinput.cpp @@ -264,6 +264,7 @@ void HTTPInput::do_work() request_bytes_sent = 0; response.clear(); pending_data.clear(); + has_metacube_header = false; for (size_t i = 0; i < stream_indices.size(); ++i) { servers->set_header(stream_indices[i], "", ""); }