generic-library/openjpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

solved memory leak of opj_server, and removed redundant defines

Browse Source
This commit is contained in:
Kaori Hagihara
2011-11-03 17:20:00 +00:00
parent 46367a7a7b
commit d16c93aa08
13 changed files with 127 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
applications/jpip/libopenjpip/target_manager.c
View File

@@ -69,19 +69,19 @@ targetlist_param_t * gene_targetlist()
*/
int open_jp2file( char filename[]);
target_param_t * gene_target( targetlist_param_t *targetlist, char *targetname)
target_param_t * gene_target( targetlist_param_t *targetlist, char *targetpath)
{
target_param_t *target;
int fd;
index_param_t *jp2idx;
static int last_csn = 0;
if( targetname[0]=='\0'){
fprintf( FCGI_stderr, "Error: exception, no targetname in gene_target()\n");
if( targetpath[0]=='\0'){
fprintf( FCGI_stderr, "Error: exception, no targetpath in gene_target()\n");
return NULL;
}
if((fd = open_jp2file( targetname)) == -1){
if((fd = open_jp2file( targetpath)) == -1){
fprintf( FCGI_stdout, "Status: 404\r\n");
return NULL;
}
@@ -93,7 +93,7 @@ target_param_t * gene_target( targetlist_param_t *targetlist, char *targetname)
target = (target_param_t *)malloc( sizeof(target_param_t));
snprintf( target->tid, MAX_LENOFTID, "%x-%x", (unsigned int)time(NULL), (unsigned int)rand());
strcpy( target->filename, targetname);
target->filename = strdup( targetpath);
target->fd = fd;
target->csn = last_csn++;
target->codeidx = jp2idx;
@@ -109,7 +109,7 @@ target_param_t * gene_target( targetlist_param_t *targetlist, char *targetname)
targetlist->last = target;
#ifndef SERVER
fprintf( logstream, "local log: target %s generated\n", targetname);
fprintf( logstream, "local log: target %s generated\n", targetpath);
#endif
return target;
@@ -129,11 +129,16 @@ void unrefer_target( target_param_t *target)
void delete_target( target_param_t **target)
{
close( (*target)->fd);
delete_index ( &(*target)->codeidx);
if( (*target)->codeidx)
delete_index ( &(*target)->codeidx);
#ifndef SERVER
fprintf( logstream, "local log: target: %s deleted\n", (*target)->filename);
#endif
free( (*target)->filename);
free(*target);
}