diff --git a/src/ir_decoder/CMakeLists.txt b/src/ir_decoder/CMakeLists.txt index 6be2299..e3836a8 100644 --- a/src/ir_decoder/CMakeLists.txt +++ b/src/ir_decoder/CMakeLists.txt @@ -44,5 +44,5 @@ set(SOURCE_FILES_SHARED_LIB irda_utils.c include/irda_utils.h) -# add_executable(irda_decoder ${SOURCE_FILES_EXECUTABLE}) -add_library(irda_decoder SHARED ${SOURCE_FILES_SHARED_LIB}) +add_executable(irda_decoder ${SOURCE_FILES_EXECUTABLE}) +# add_library(irda_decoder SHARED ${SOURCE_FILES_SHARED_LIB}) diff --git a/src/ir_decoder/irda_decode.c b/src/ir_decoder/irda_decode.c index 8ac7294..9e29a46 100644 --- a/src/ir_decoder/irda_decode.c +++ b/src/ir_decoder/irda_decode.c @@ -335,6 +335,7 @@ INT8 irda_ac_file_open(const char* file_name) if (NULL == binary_content) { IR_PRINTF("\nfailed to alloc memory for binary\n"); + fclose(stream); return IR_DECODE_FAILED; } @@ -759,10 +760,9 @@ INT8 irda_ac_lib_parse() #if defined BOARD_PC void irda_lib_free_inner_buffer() { - if (NULL != pirda_buffer->data) { - irda_free(pirda_buffer->data); - pirda_buffer->len = 0; - pirda_buffer->offset = 0; + if (NULL != binary_content) { + irda_free(binary_content); + binary_content = NULL; } } #endif @@ -1252,6 +1252,12 @@ INT8 irda_tv_file_open(const char* file_name) IR_PRINTF("length of binary = %d\n", (int)binary_length); binary_content = (UINT8*) irda_malloc(binary_length); + if (NULL == binary_content) + { + IR_PRINTF("\nfailed to alloc memory for binary\n"); + fclose(stream); + return IR_DECODE_FAILED; + } fseek(stream, 0, SEEK_SET); ret = fread(binary_content, binary_length, 1, stream); diff --git a/src/web_console/compiler.jar b/src/web_console/compiler.jar deleted file mode 100644 index fc29086..0000000 Binary files a/src/web_console/compiler.jar and /dev/null differ diff --git a/src/web_console/script_compile.sh b/src/web_console/script_compile.sh deleted file mode 100644 index ca83ee5..0000000 --- a/src/web_console/script_compile.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash -SOURCE="." -TARGET="$POEM_APPLICATION/irext_console" -MODULE_API="./web/api_doc/js/" - -function deploy() -{ - for file in `ls $1` - do - echo $file - if [ -d $1"/"$file ] - then - deploy $1"/"$file - else - if [ $1"/" = $MODULE_API ] - then - echo "compiling file" $1"/"$file - mkdir -p $TARGET$1 - java -jar compiler.jar --js $1"/"$file --js_output_file $TARGET$1"/"$file - else - echo "copying file" $1"/"$file - mkdir -p $TARGET$1 - cp -v -f $1"/"$file $TARGET$1"/"$file - fi - fi - done -} - -INIT_PATH="./" -#rm -rf $TARGET -deploy $INIT_PATH -mv $TARGET$INIT_PATH $TARGET -#cp $SOURCE"/"run.sh $TARGET