mirror
/
brotli
mirror of https://github.com/andybalholm/brotli.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Fix negative slice indexes.

This commit is contained in:
Andy Balholm 2019-03-23 11:17:03 -07:00
parent 08371dc992
commit 45f5d9b05a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compress_fragment_two_pass.go
View File

@ -278,7 +278,7 @@ func createCommands(input []byte, block_size uint, input_size uint, base_ip_ptr
next_hash = hash1(input[next_ip:], shift, min_match) next_hash = hash1(input[next_ip:], shift, min_match)
candidate = ip - last_distance candidate = ip - last_distance
if isMatch1(input[ip:], input[candidate:], min_match) { if isMatch1(input[ip:], base_ip_ptr[candidate-base_ip:], min_match) {
if candidate < ip { if candidate < ip {
table[hash] = int(ip - base_ip) table[hash] = int(ip - base_ip)
break break
@ -290,7 +290,7 @@ func createCommands(input []byte, block_size uint, input_size uint, base_ip_ptr
assert(candidate < ip) assert(candidate < ip)
table[hash] = int(ip - base_ip) table[hash] = int(ip - base_ip)
if !(!isMatch1(input[ip:], input[candidate:], min_match)) { if isMatch1(input[ip:], base_ip_ptr[candidate-base_ip:], min_match) {
break break
} }
} }
@ -308,7 +308,7 @@ func createCommands(input []byte, block_size uint, input_size uint, base_ip_ptr
{ {
var base int = ip var base int = ip
/* > 0 */ /* > 0 */
var matched uint = min_match + findMatchLengthWithLimit(input[uint(candidate)+min_match:], input[uint(ip)+min_match:], uint(ip_end-ip)-min_match) var matched uint = min_match + findMatchLengthWithLimit(base_ip_ptr[uint(candidate-base_ip)+min_match:], input[uint(ip)+min_match:], uint(ip_end-ip)-min_match)
var distance int = int(base - candidate) var distance int = int(base - candidate)
/* We have a 6-byte match at ip, and we need to emit bytes in /* We have a 6-byte match at ip, and we need to emit bytes in
[next_emit, ip). */ [next_emit, ip). */
@ -370,12 +370,12 @@ func createCommands(input []byte, block_size uint, input_size uint, base_ip_ptr
} }
} }
for ip-candidate <= maxDistance_compress_fragment && isMatch1(input[ip:], input[candidate:], min_match) { for ip-candidate <= maxDistance_compress_fragment && isMatch1(input[ip:], base_ip_ptr[candidate-base_ip:], min_match) {
var base int = ip var base int = ip
/* We have a 6-byte match at ip, and no need to emit any /* We have a 6-byte match at ip, and no need to emit any
literal bytes prior to ip. */ literal bytes prior to ip. */
var matched uint = min_match + findMatchLengthWithLimit(input[uint(candidate)+min_match:], input[uint(ip)+min_match:], uint(ip_end-ip)-min_match) var matched uint = min_match + findMatchLengthWithLimit(base_ip_ptr[uint(candidate-base_ip)+min_match:], input[uint(ip)+min_match:], uint(ip_end-ip)-min_match)
ip += int(matched) ip += int(matched)
last_distance = int(base - candidate) /* > 0 */ last_distance = int(base - candidate) /* > 0 */
emitCopyLen(matched, commands) emitCopyLen(matched, commands)