Merge pull request #12843 from alalek:fix_qrdecode_input_validation
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 15 Oct 2018 19:18:58 +0000 (19:18 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 15 Oct 2018 19:18:58 +0000 (19:18 +0000)

Trivial merge