hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-27 19:24:06 +00:00
Code Issues Actions Projects Releases Wiki Activity

Fix crash when crypto compiled in but disabled

Browse source 
When kvazaar was built with crypto++ but running without using
encryption features, kvazaar attempted to delete an uninitialized crypto
handle. Fixed by setting the handle to NULL in kvz_encoder_state_init.
This commit is contained in:
Arttu Ylä-Outinen 2017-05-23 14:01:48 +03:00
parent 8654b48186
commit 2e8838de6e
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/encoder_state-ctors_dtors.c
View file

@ -29,7 +29,6 @@
#include "encoder.h" #include "encoder.h"
#include "encoder_state-geometry.h" #include "encoder_state-geometry.h"
#include "encoderstate.h" #include "encoderstate.h"
#include "extras/crypto.h"
#include "image.h" #include "image.h"
#include "imagelist.h" #include "imagelist.h"
#include "kvazaar.h" #include "kvazaar.h"
@ -308,6 +307,7 @@ int kvz_encoder_state_init(encoder_state_t * const child_state, encoder_state_t
child_state->parent = parent_state; child_state->parent = parent_state;
child_state->children = MALLOC(encoder_state_t, 1); child_state->children = MALLOC(encoder_state_t, 1);
child_state->children[0].encoder_control = NULL; child_state->children[0].encoder_control = NULL;
child_state->crypto_hdl = NULL;
child_state->tqj_bitstream_written = NULL; child_state->tqj_bitstream_written = NULL;
child_state->tqj_recon_done = NULL; child_state->tqj_recon_done = NULL;