summaryrefslogtreecommitdiff
path: root/apps/couch/src
diff options
context:
space:
mode:
authorAdam Kocoloski <kocolosk@apache.org>2011-10-26 14:04:54 -0400
committerRobert Newson <robert.newson@cloudant.com>2011-10-31 17:13:59 +0000
commita6352493651f6f8e3430269555421b5599a77809 (patch)
tree6015f6c268c6a6aaa183b996273e1bc334a1b26b /apps/couch/src
parentf351ee614b620f3c642cce63c95fced99ff4af46 (diff)
Fix retrieval of headers larger than 4k
Our headers start with a <<1>> and then four bytes indicating the length of the header and its checksum. When the header is larger than 4090 bytes it will be split across multiple blocks in the file and will need to be reassembled on read. The reassembly consists of stripping out <<0>> from the beginning of each subsequent block in the remove_block_prefixes/2 function. The bug here is that we tell remove_block_prefixes that we're starting 1 byte into the current block instead of 5, so it ends up removing one good byte from the header and injecting one or more random <<0>>s. Headers larger than 4k are very rare and generally require a view group with a huge number of indexes or indexes with fairly large reductions, which explains why this bug has gone undetected until now. Closes COUCHDB-1319.
Diffstat (limited to 'apps/couch/src')
-rw-r--r--apps/couch/src/couch_file.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/couch/src/couch_file.erl b/apps/couch/src/couch_file.erl
index dfc1f822..1985f5eb 100644
--- a/apps/couch/src/couch_file.erl
+++ b/apps/couch/src/couch_file.erl
@@ -528,7 +528,7 @@ load_header(Fd, Block) ->
RawBin = <<RestBlock/binary, Missing/binary>>
end,
<<Md5Sig:16/binary, HeaderBin/binary>> =
- iolist_to_binary(remove_block_prefixes(1, RawBin)),
+ iolist_to_binary(remove_block_prefixes(5, RawBin)),
Md5Sig = couch_util:md5(HeaderBin),
{ok, HeaderBin}.