]> git.sesse.net Git - cubemap/commitdiff
(Hopefully) fix an assert failure in httpinput.cpp.
authorSteinar H. Gunderson <sgunderson@bigfoot.com>
Thu, 6 Jun 2013 00:21:46 +0000 (02:21 +0200)
committerSteinar H. Gunderson <sgunderson@bigfoot.com>
Thu, 6 Jun 2013 00:21:46 +0000 (02:21 +0200)
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.

httpinput.cpp

index 19167f0b6b7404df6592dc9e9e2805bd9424325d..275df501f6fb9c92b44d3023091852076595ec40 100644 (file)
@@ -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], "", "");
                        }