Skip to content

Commit 366d960

Browse files
committed
Memory leak suspected
1 parent 22379a5 commit 366d960

File tree

3 files changed

+26
-13
lines changed

3 files changed

+26
-13
lines changed

.circleci/config.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ builddeploy_steps: &builddeploy_steps
6262
# # reconciler deployment
6363
# rm -rf buildenvvar
6464
# ./unsetenv.sh
65-
./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-reconciler-deployvar
66-
source buildenvvar
67-
./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME}
65+
# ./buildenv.sh -e $DEPLOY_ENV -b ${LOGICAL_ENV}-${APPNAME}-reconciler-deployvar
66+
# source buildenvvar
67+
# ./master_deploy.sh -d ECS -e $DEPLOY_ENV -t latest -s ${LOGICAL_ENV}-global-appvar,${LOGICAL_ENV}-${APPNAME}-appvar -i ${APPNAME}
6868
6969
7070
jobs:

informix_auditing/audit_util.c

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ mi_string *doInsertCN()
158158
//fixname(pdbname);
159159
sprintf(&buffer[posi], "\"SCHEMANAME\": \"%s\", ", pdbname);
160160
posi = strlen(buffer);
161-
printf("\"TABLENAME\": \"%s\", ", tabname);
161+
printf("\"DBNAME-TABLENAME-operation-TIME\": \"%s-%s-INSERT-%s\" \n",pdbname,tabname,cdatetime);
162162
sprintf(&buffer[posi], "\"TABLENAME\": \"%s\", ", tabname);
163163
posi = strlen(buffer);
164164
sprintf(&buffer[posi], "\"OPERATION\": \"INSERT\", ");
@@ -182,7 +182,9 @@ DPRINTF("logger", 90, ("insert: colname: (0x%x) [%s]", pcolname, pcolname));
182182
sprintf(&buffer[posi], ", ");
183183
posi = strlen(buffer);
184184
}
185-
sprintf(&buffer[posi], "\"%s\" : \"%s\"", pcolname, escapecharjson(pcast));
185+
char *bufdatval = escapecharjson(pcast);
186+
sprintf(&buffer[posi], "\"%s\" : \"%s\"", pcolname, bufdatval);
187+
free(bufdatval);
186188
if (strcmp("unsupportedtype", pcast) == 0) {
187189
strcpy(uniquedatatype, "true");
188190
}
@@ -200,6 +202,7 @@ DPRINTF("logger", 90, ("insert: colname: (0x%x) [%s]", pcolname, pcolname));
200202
} else {
201203
sprintf(&buffer[posi], "}, \n \"uniquedatatype\" : \"false\" \n }");
202204
}
205+
printf("\"DBNAME-TABLENAME-operation-TIME\": \"%s-%s-INSERT-%s-Completed\" \n",pdbname,tabname,cdatetime);
203206
free(cdatetime);
204207
return(buffer);
205208
}
@@ -310,6 +313,7 @@ mi_string *doDeleteCN()
310313
sprintf(&buffer[posi], "\"SCHEMANAME\": \"%s\", ", pdbname);
311314
posi = strlen(buffer);
312315
sprintf(&buffer[posi], "\"TABLENAME\": \"%s\", ", ptabname);
316+
printf("\"DBNAME-TABLENAME-operation-TIME\": \"%s-%s-DELETE-%s\" \n", pdbname,ptabname,cdatetime);
313317
posi = strlen(buffer);
314318
sprintf(&buffer[posi], "\"OPERATION\": \"DELETE\", ");
315319
posi = strlen(buffer);
@@ -336,7 +340,9 @@ DPRINTF("logger", 90, ("delete: colname: (0x%x) [%s]", pcolname, pcolname));
336340

337341
//pcast = escapecharjson(pcast);
338342
//printf("%s",pcast);
339-
sprintf(&buffer[posi], "\"%s\" : \"%s\"", pcolname, escapecharjson(pcast));
343+
char *bufdatdelval = escapecharjson(pcast);
344+
sprintf(&buffer[posi], "\"%s\" : \"%s\"", pcolname, bufdatdelval);
345+
free(bufdatdelval)
340346
if (strcmp("unsupportedtype", pcast) == 0) {
341347
strcpy(uniquedatatype, "true");
342348
}
@@ -355,6 +361,7 @@ DPRINTF("logger", 90, ("delete: colname: (0x%x) [%s]", pcolname, pcolname));
355361
} else {
356362
sprintf(&buffer[posi], "}, \n \"uniquedatatype\" : \"false\" \n }");
357363
}
364+
printf("\"DBNAME-TABLENAME-operation-TIME\": \"%s-%s-DELETE-%s-Completed\" \n ", pdbname,ptabname,cdatetime);
358365
free(cdatetime);
359366
return(buffer);
360367
}
@@ -406,7 +413,8 @@ mi_string *doUpdateCN()
406413
//fixname(pdbname);
407414
sprintf(&buffer[posi], "\"SCHEMANAME\": \"%s\", ", pdbname);
408415
posi = strlen(buffer);
409-
sprintf(&buffer[posi], "\"TABLENAME\": \"%s\", ", ptabname);
416+
sprintf(&buffer[posi], "\"TABLENAME\": \"%s\", ", ptabname);
417+
printf("\"DBNAME-TABLENAME-operation-TIME\": \"%s-%s-UPDATE-%s\" \n", pdbname,ptabname,cdatetime);
410418
posi = strlen(buffer);
411419
sprintf(&buffer[posi], "\"OPERATION\": \"UPDATE\", ");
412420
posi = strlen(buffer);
@@ -448,7 +456,11 @@ mi_string *doUpdateCN()
448456
sprintf(&buffer[pbufLen], ", ");
449457
pbufLen = strlen(buffer);
450458
}
451-
sprintf(&buffer[pbufLen], "\"%s\" : { \"old\" : \"%s\", \"new\" : \"%s\" }", poldcolname, escapecharjson(pcast), escapecharjson(pcast2));
459+
char *bufdatoldval = escapecharjson(pcast);
460+
char *bufdatnewval = escapecharjson(pcast2);
461+
sprintf(&buffer[pbufLen], "\"%s\" : { \"old\" : \"%s\", \"new\" : \"%s\" }", poldcolname, bufdatoldval, bufdatnewval);
462+
free(bufdatoldval);
463+
free(bufdatnewval);
452464
if (strcmp("unsupportedtype", pcast2) == 0) {
453465
strcpy(uniquedatatype, "true");
454466
}
@@ -464,6 +476,7 @@ mi_string *doUpdateCN()
464476
sprintf(&buffer[pbufLen], "}, \n \"uniquedatatype\" : \"false\" \n }");
465477
}
466478
DPRINTF("logger", 90, ("Exiting doUpdateCN()"));
479+
printf("\"DBNAME-TABLENAME-operation-TIME\": \"%s-%s-UPDATE-%s-Completed\" \n ", pdbname,ptabname,cdatetime);
467480
free(cdatetime);
468481
return(buffer);
469482
}
@@ -579,7 +592,7 @@ char * escapecharjson( char *jsonvalue_org)
579592
escjsonvalue = (char *)calloc(10000, sizeof(char));
580593
for (jsonvalue_copy = jsonvalue_org; *jsonvalue_copy != '\0'; jsonvalue_copy++) {
581594

582-
printf("%c:%d\n", *jsonvalue_copy,*jsonvalue_copy);
595+
//printf("%c:%d\n", *jsonvalue_copy,*jsonvalue_copy);
583596
if (*jsonvalue_copy == '"') {
584597
posi = strlen(escjsonvalue);
585598
sprintf(&escjsonvalue[posi], "%s","\\\"") ;
@@ -616,6 +629,6 @@ char * escapecharjson( char *jsonvalue_org)
616629
}
617630
//p=NULL;
618631
jsonvalue_copy=NULL;
619-
printf("%s", escjsonvalue);
632+
//printf("%s", escjsonvalue);
620633
return(escjsonvalue);
621634
}

informix_auditing/auditing2.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ void do_auditing2( mi_lvarchar *sessionusername, MI_FPARAM *fp)
6060
mi_string buffer[32], *pdata;
6161

6262
DPRINTF("logger", 80, ("connected user %s", mi_lvarchar_to_string(sessionusername)));
63-
printf("operating user %s welcome test \n",mi_lvarchar_to_string(sessionusername));
63+
printf("USER Triggered: %s\n",mi_lvarchar_to_string(sessionusername));
6464
if (strcmp(mi_lvarchar_to_string(sessionusername), "ifxsyncuser") == 0)
6565
{
6666
printf("automated user. skipping trigger\n");
@@ -72,14 +72,14 @@ void do_auditing2( mi_lvarchar *sessionusername, MI_FPARAM *fp)
7272
if (trigger_operation & MI_TRIGGER_NOT_IN_EVENT) {
7373
/* not in a trigger! generate an exception */
7474
mi_db_error_raise(NULL, MI_EXCEPTION,
75-
"do_auditing1() can only be called within a trigger!", NULL);
75+
"do_auditing2() can only be called within a trigger!", NULL);
7676
return;
7777
}
7878
/* Make sure this is in a FOR EACH type of trigger */
7979
if (0 == (trigger_operation & MI_TRIGGER_FOREACH_EVENT) ) {
8080
/* not in a for each trigger! generate an exception */
8181
mi_db_error_raise(NULL, MI_EXCEPTION,
82-
"do_auditing1() must be in a FOR EACH trigger operation", NULL);
82+
"do_auditing2() must be in a FOR EACH trigger operation", NULL);
8383
return;
8484
}
8585
/* keep only the SQL operation */

0 commit comments

Comments
 (0)