Merge pull request #8441 from keszybz/oss-fuzz-fixes
authorEvgeny Vereshchagin <evvers@ya.ru>
Wed, 14 Mar 2018 18:25:56 +0000 (21:25 +0300)
committerGitHub <noreply@github.com>
Wed, 14 Mar 2018 18:25:56 +0000 (21:25 +0300)
Fixes for bugs found by oss-fuzz


Trivial merge