irext/core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed stack corruption for decode algorithm

Browse Source
This commit is contained in:
strawmanbobi
2016-12-24 20:45:17 +08:00
parent 610a08fcff
commit cb1cbd3c57
6 changed files with 1286 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ir_decoder/.gitignore vendored
View File

@@ -12,4 +12,5 @@ Release/
*.opensdf
.DS_Store
.vs
ir_decoder.vcxproj.user
ir_decoder.vcxproj.user
irda_decoder.exe.stackdump

18
src/ir_decoder/include/irda_decode.h
View File

@@ -446,6 +446,15 @@ extern UINT16 user_data[];
*/
extern INT8 irda_context_init();
/*
* function irda_ac_file_open
*
* parameters: file name of remote binary
*
* return: IR_DECODE_SUCCEEDED / IR_DECODE_FAILED
*/
extern INT8 irda_ac_file_open(const char* file_name);
/*
* function irda_ac_lib_open
*
@@ -489,6 +498,15 @@ extern void irda_ac_lib_close();
///////////////////////////////////////////////// AC End /////////////////////////////////////////////////
///////////////////////////////////////////////// TV Begin /////////////////////////////////////////////////
/*
* function irda_tv_file_open
*
* parameters: file name of remote binary
*
* return: IR_DECODE_SUCCEEDED / IR_DECODE_FAILED
*/
INT8 irda_tv_file_open(const char* file_name);
/*
* function irda_tv_lib_open
*

1174
src/ir_decoder/include/jni.h Normal file
View File

File diff suppressed because it is too large Load Diff

97
src/ir_decoder/irda_decode.c
View File

@@ -45,6 +45,8 @@ UINT16 tag_head_offset = 0;
UINT8 byteArray[PROTOCOL_SIZE] = { 0 };
UINT8 tv_bin[EXPECTED_MEM_SIZE] = { 0 };
long binary_length = 0;
UINT8 *binary_content = NULL;
// 2016-10-09 updated by strawmanbobi, change global data context to array pointer
protocol *context = (protocol *) byteArray;
@@ -76,7 +78,7 @@ const UINT16 tag_index[TAG_COUNT_FOR_PROTOCOL] =
};
#if defined BOARD_PC
void free_pirda(void);
void irda_lib_free_inner_buffer();
#endif
///////////////////////////////////////////////// AC Begin /////////////////////////////////////////////////
@@ -311,6 +313,44 @@ INT8 free_ac_context()
return IR_DECODE_SUCCEEDED;
}
INT8 irda_ac_file_open(const char* file_name)
{
#if !defined WIN32
FILE *stream = fopen(file_name, "rb");
#else
FILE *stream;
fopen_s(&stream, file_name, "rb");
#endif
if (NULL == stream)
{
IR_PRINTF("\nfile open failed\n");
return IR_DECODE_FAILED;
}
fseek(stream, 0, SEEK_END);
binary_length = ftell(stream);
binary_content = (UINT8*) irda_malloc(binary_length);
if (NULL == binary_content)
{
IR_PRINTF("\nfailed to alloc memory for binary\n");
return IR_DECODE_FAILED;
}
fseek(stream, 0, SEEK_SET);
fread(binary_content, binary_length, 1, stream);
fclose(stream);
if (IR_DECODE_FAILED == irda_ac_lib_open(binary_content, binary_length))
{
irda_free(binary_content);
binary_length = 0;
return IR_DECODE_FAILED;
}
return IR_DECODE_SUCCEEDED;
}
INT8 irda_ac_lib_open(UINT8 *binary, UINT16 binary_length)
{
// it is recommended that the parameter binary pointing to
@@ -699,7 +739,7 @@ INT8 irda_ac_lib_parse()
// or make global buffer shared in extreme memory case
/* in case of running with test - begin */
#if defined BOARD_PC
free_pirda();
irda_lib_free_inner_buffer();
#endif
/* in case of running with test - end */
@@ -707,11 +747,13 @@ INT8 irda_ac_lib_parse()
}
#if defined BOARD_PC
void free_pirda(void)
void irda_lib_free_inner_buffer()
{
irda_free(pirda_buffer->data);
pirda_buffer->len = 0;
pirda_buffer->offset = 0;
if (NULL != pirda_buffer->data) {
irda_free(pirda_buffer->data);
pirda_buffer->len = 0;
pirda_buffer->offset = 0;
}
}
#endif
@@ -1176,6 +1218,45 @@ INT8 get_supported_wind_direction(UINT8* supported_wind_direction)
///////////////////////////////////////////////// AC End //////////////////////////////////////////////////
///////////////////////////////////////////////// TV Begin /////////////////////////////////////////////////
INT8 irda_tv_file_open(const char* file_name)
{
int print_index = 0;
#if !defined WIN32
FILE *stream = fopen(file_name, "rb");
#else
FILE *stream;
fopen_s(&stream, file_name, "rb");
#endif
IR_PRINTF("file name = %s\n", file_name);
if (stream == NULL)
{
IR_PRINTF("\nfile open failed\n");
return IR_DECODE_FAILED;
}
fseek(stream, 0, SEEK_END);
binary_length = ftell(stream);
IR_PRINTF("length of binary = %d\n", (int)binary_length);
binary_content = (UINT8*) irda_malloc(binary_length);
fseek(stream, 0, SEEK_SET);
fread(binary_content, binary_length, 1, stream);
fclose(stream);
if (IR_DECODE_FAILED == irda_tv_lib_open(binary_content, binary_length))
{
irda_free(binary_content);
binary_length = 0;
return IR_DECODE_FAILED;
}
return IR_DECODE_SUCCEEDED;
}
INT8 irda_tv_lib_open(UINT8 *binary, UINT16 binary_length)
{
return tv_lib_open(binary, binary_length);
@@ -1215,7 +1296,9 @@ UINT16 irda_tv_lib_control(UINT8 key, UINT16* l_user_data)
INT8 irda_tv_lib_close()
{
// no need to close tv binary
#if defined BOARD_PC
irda_lib_free_inner_buffer();
#endif
return IR_DECODE_SUCCEEDED;
}
///////////////////////////////////////////////// TV End /////////////////////////////////////////////////

88
src/ir_decoder/irda_main.c
View File

@@ -27,51 +27,12 @@ Revision log:
#include "include/irda_main.h"
// global variable definition
long binary_length = 0;
UINT8 *binary_content = NULL;
remote_ac_status_t ac_status;
UINT16 user_data[USER_DATA_SIZE];
INT8 irda_ac_file_open(const char* file_name);
INT8 irda_tv_file_open(const char* file_name);
INT8 irda_ac_file_open(const char* file_name)
{
#if !defined WIN32
FILE *stream = fopen(file_name, "rb");
#else
FILE *stream;
fopen_s(&stream, file_name, "rb");
#endif
if (NULL == stream)
{
IR_PRINTF("\nfile open failed : %d\n", errno);
return IR_DECODE_FAILED;
}
fseek(stream, 0, SEEK_END);
binary_length = ftell(stream);
binary_content = (UINT8*) irda_malloc(binary_length);
if (NULL == binary_content)
{
IR_PRINTF("\nfailed to alloc memory for binary\n");
return IR_DECODE_FAILED;
}
fseek(stream, 0, SEEK_SET);
fread(binary_content, binary_length, 1, stream);
fclose(stream);
if (IR_DECODE_FAILED == irda_ac_lib_open(binary_content, binary_length))
{
irda_free(binary_content);
binary_length = 0;
return IR_DECODE_FAILED;
}
return IR_DECODE_SUCCEEDED;
}
INT8 decode_as_ac(const char* file_name)
{
@@ -214,49 +175,6 @@ INT8 decode_as_ac(const char* file_name)
irda_ac_lib_close();
// free binary buffer
irda_free(binary_content);
binary_length = 0;
return IR_DECODE_SUCCEEDED;
}
INT8 irda_tv_file_open(const char* file_name)
{
int print_index = 0;
#if !defined WIN32
FILE *stream = fopen(file_name, "rb");
#else
FILE *stream;
fopen_s(&stream, file_name, "rb");
#endif
IR_PRINTF("file name = %s\n", file_name);
if (stream == NULL)
{
IR_PRINTF("\nfile open failed : %d\n", errno);
return IR_DECODE_FAILED;
}
fseek(stream, 0, SEEK_END);
binary_length = ftell(stream);
IR_PRINTF("length of binary = %d\n", (int)binary_length);
binary_content = (UINT8*) irda_malloc(binary_length);
fseek(stream, 0, SEEK_SET);
fread(binary_content, binary_length, 1, stream);
fclose(stream);
if (IR_DECODE_FAILED == irda_tv_lib_open(binary_content, binary_length))
{
irda_free(binary_content);
binary_length = 0;
return IR_DECODE_FAILED;
}
return IR_DECODE_SUCCEEDED;
}
@@ -299,10 +217,6 @@ INT8 decode_as_tv(char *file_name, UINT8 irda_hex_encode)
}
} while('Q' != in_char);
// free binary buffer
irda_free(binary_content);
binary_length = 0;
return IR_DECODE_SUCCEEDED;
}

2
src/web_console/configuration/system_configs.js
View File

@@ -18,7 +18,7 @@ exports.setupEnvironment = function () {
MYSQL_DB_PASSWORD = "root";
FILE_TEMP_PATH = "~/home/your_name/rc_extension";
PYTHON_PATH = "/usr/bin/python";
LISTEN_PORT = "80";
LISTEN_PORT = "8300";
SERVER_ADDRESS = "localhost";
REDIS_HOST = "localhost";
REDIS_PORT = "6379";