From 817d72272b9a49d54bf5f62fba24a733c35ad7a1 Mon Sep 17 00:00:00 2001 From: "adam.b" Date: Fri, 25 Nov 2016 14:19:51 +0000 Subject: [PATCH] fixed a svace error Change-Id: I9a89e885e2ea1f239319b38c784441c2ea586cfa --- examples/fpp-game/game-utils.cpp | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/examples/fpp-game/game-utils.cpp b/examples/fpp-game/game-utils.cpp index 5588a4b..8cb99f1 100644 --- a/examples/fpp-game/game-utils.cpp +++ b/examples/fpp-game/game-utils.cpp @@ -25,19 +25,25 @@ namespace GameUtils bool LoadFile( const char* filename, ByteArray& bytes ) { FILE* fin = fopen( filename, "rb" ); - if( fseek( fin, 0, SEEK_END ) ) + if( fin ) { - return false; + if( fseek( fin, 0, SEEK_END ) ) + { + fclose(fin); + return false; + } + bytes.resize( ftell( fin ) ); + std::fill( bytes.begin(), bytes.end(), 0 ); + if( fseek( fin, 0, SEEK_SET ) ) + { + fclose( fin ); + return false; + } + size_t result = fread( bytes.data(), 1, bytes.size(), fin ); + fclose( fin ); + return ( result != 0 ); } - bytes.resize( ftell( fin ) ); - std::fill( bytes.begin(), bytes.end(), 0 ); - if( fseek( fin, 0, SEEK_SET ) ) - { - return false; - } - size_t result = fread( bytes.data(), 1, bytes.size(), fin ); - fclose( fin ); - return (result != 0); + return false; } size_t HashString( const char* str ) -- 2.7.4