Make the header removal compressor complain if the start of a frame doesn't match the pattern it should remove. This will have to be improved later if we decide to allow "lossy removal", but for now it is safer.

This commit is contained in:
Moritz Bunkus 2005-10-18 11:43:51 +00:00
parent 4b6932b8e9
commit 2496ee620d

View File

@ -281,20 +281,20 @@ header_removal_compressor_c::compress(memory_cptr &buffer) {
buffer->get_size(), buffer->get_size(),
m_bytes->get_size())); m_bytes->get_size()));
// if (memcmp(buffer->get(), m_bytes->get(), m_bytes->get_size())) { if (memcmp(buffer->get(), m_bytes->get(), m_bytes->get_size())) {
// string b_buffer, b_bytes; string b_buffer, b_bytes;
// int i; int i;
// for (i = 0; m_bytes->get_size() > i; ++i) { for (i = 0; m_bytes->get_size() > i; ++i) {
// b_buffer += mxsprintf(" %02x", buffer->get()[i]); b_buffer += mxsprintf(" %02x", buffer->get()[i]);
// b_bytes += mxsprintf(" %02x", m_bytes->get()[i]); b_bytes += mxsprintf(" %02x", m_bytes->get()[i]);
// } }
// throw compression_error_c(mxsprintf("Header removal compression not " throw compression_error_c(mxsprintf("Header removal compression not "
// "possible because the buffer did not " "possible because the buffer did not "
// "start with the bytes that should be " "start with the bytes that should be "
// "removed. Wanted bytes:%s; found:%s.", "removed. Wanted bytes:%s; found:%s.",
// b_bytes.c_str(), b_buffer.c_str())); b_bytes.c_str(), b_buffer.c_str()));
// } }
memmove(buffer->get(), buffer->get() + m_bytes->get_size(), memmove(buffer->get(), buffer->get() + m_bytes->get_size(),
buffer->get_size() - m_bytes->get_size()); buffer->get_size() - m_bytes->get_size());