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

encmain: Make the main function more resilient to allocation failures

Browse source 
Application will no longer crash if config or encoder_control
allocation fails.
This commit is contained in:
Jan Ekström 2014-01-31 17:26:09 +02:00
parent 271c08f963
commit 7db28fad84
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/encmain.c
View file

@ -73,6 +73,8 @@ int main(int argc, char *argv[])
FILE *recout = fopen("encrec_832x480_60.yuv","wb"); //!< reconstructed YUV output (only on debug mode) FILE *recout = fopen("encrec_832x480_60.yuv","wb"); //!< reconstructed YUV output (only on debug mode)
#endif #endif
encoder_control *encoder = (encoder_control*)malloc(sizeof(encoder_control)); encoder_control *encoder = (encoder_control*)malloc(sizeof(encoder_control));
if (!encoder)
fprintf(stderr, "Failed to allocate the encoder_control object!\n");
// Windows needs all of the standard in/outputs to be set to _O_BINARY // Windows needs all of the standard in/outputs to be set to _O_BINARY
#ifdef _WIN32 #ifdef _WIN32
@ -85,7 +87,7 @@ int main(int argc, char *argv[])
cfg = config_alloc(); cfg = config_alloc();
// If problem with configuration, print banner and shutdown // If problem with configuration, print banner and shutdown
if (!config_init(cfg) || !config_read(cfg,argc,argv)) { if (!cfg || !encoder || !config_init(cfg) || !config_read(cfg,argc,argv)) {
fprintf(stderr, "/***********************************************/\r\n"); fprintf(stderr, "/***********************************************/\r\n");
fprintf(stderr, " * Kvazaar HEVC Encoder v. " VERSION_STRING "*\r\n"); fprintf(stderr, " * Kvazaar HEVC Encoder v. " VERSION_STRING "*\r\n");
fprintf(stderr, " * Tampere University of Technology 2014 *\r\n"); fprintf(stderr, " * Tampere University of Technology 2014 *\r\n");
@ -101,7 +103,9 @@ int main(int argc, char *argv[])
fprintf(stderr, " 1: all pictures are intra\r\n"); fprintf(stderr, " 1: all pictures are intra\r\n");
fprintf(stderr, " 2-N: every Nth picture is intra\r\n"); fprintf(stderr, " 2-N: every Nth picture is intra\r\n");
if (cfg)
config_destroy(cfg); config_destroy(cfg);
free(encoder); free(encoder);
return EXIT_FAILURE; return EXIT_FAILURE;
} }