reverting to curl leak fix to make sync [skip ci]

Author: Gunasekar-K

informix_auditing/audit_util.c

@@ -68,19 +68,13 @@ mi_string *do_castl(MI_CONNECTION *conn, MI_DATUM *datum,
     printf("-- typeName=%s --",srcType);
     if ((strcmp("blob",   srcType) == 0) || (strcmp("clob",   srcType) == 0) || (strcmp("text",   srcType) == 0) || (strcmp("byte",   srcType) == 0)) {
             printf("skiping data read\n");
-            mi_free(dsc);
-            mi_free(srcType);            
             return("unsupportedtype");
      }
    else{ 
    if (strcmp("date",   srcType) == 0) {
-     mi_free(dsc);
-     mi_free(srcType);     
      return (mi_date_to_string((mi_date *)datum));
    }
    if (strcmp("datetime",   srcType) == 0) {
-    mi_free(dsc);
-    mi_free(srcType);     
     return (mi_datetime_to_string((mi_datetime *)datum));
    }
    if ((strcmp("integer",   srcType) == 0) ||
@@ -128,11 +122,7 @@ mi_string *do_castl(MI_CONNECTION *conn, MI_DATUM *datum,
   mi_routine_end(conn, fn); 
 	//return mi_type_typename(mi_type_typedesc(conn, my_type_id));
   }
-	mi_free(fp);
-  mi_free(dsc);
-  mi_free(srcType);
-  mi_free(typeid);
-  mi_free(tdesc);
+	
   return(pbuf);
 }
 /*--------------------------------------------------------------*/
@@ -216,15 +206,6 @@ mi_string *doInsertCN()
   }
     printf("\"DBNAME-TABLENAME-operation-TIME\": \"%s-%s-INSERT-%s-Completed\" \n",pdbname,tabname,cdatetime);
   free(cdatetime);
-  mi_free(row);
-  mi_free(tid);
-  mi_free(lvarTid);
-  mi_free(td);
-  mi_free(rd);
-  mi_free(ptabname);
-  mi_free(pcolname);
-  mi_free(pcast);
-  mi_free(pdbname);  
  return(buffer);
 }
 /*--------------------------------------------------------------*/
@@ -270,7 +251,7 @@ mi_string *doSelectCN()
   for (i = 0; i < colCount; i++) {
     /* get column name and type id */
     pcolname = mi_column_name(rd, i);
-    DPRINTF("logger", 90, ("insert: colname: (0x%x) [%s]", pcolname, pcolname));
+DPRINTF("logger", 90, ("insert: colname: (0x%x) [%s]", pcolname, pcolname));
     tid = mi_column_type_id(rd, i);
     switch(mi_value(row, i, &datum, &collen)) {
     /* we should do this test */
@@ -343,7 +324,7 @@ mi_string *doDeleteCN()
   for (i = 0; i < colCount; i++) {
     /* get column name and type id */
     pcolname = mi_column_name(rd, i);
-    DPRINTF("logger", 90, ("delete: colname: (0x%x) [%s]", pcolname, pcolname));
+DPRINTF("logger", 90, ("delete: colname: (0x%x) [%s]", pcolname, pcolname));
     tid = mi_column_type_id(rd, i);
     switch(mi_value(row, i, &datum, &collen)) {
     /* we should do this test */
@@ -383,16 +364,7 @@ mi_string *doDeleteCN()
       sprintf(&buffer[posi], "},  \n \"uniquedatatype\" : \"false\" \n }");
   }
    printf("\"DBNAME-TABLENAME-operation-TIME\": \"%s-%s-DELETE-%s-Completed\" \n ", pdbname,ptabname,cdatetime);
-  free(cdatetime); 
-  mi_free(row);
-  mi_free(tid);
-  mi_free(lvarTid);
-  mi_free(td);
-  mi_free(rd);
-  mi_free(ptabname);
-  mi_free(pcolname);
-  mi_free(pcast);
-  mi_free(pdbname);
+ free(cdatetime); 
  return(buffer);
 }
 /*--------------------------------------------------------------*/
@@ -509,19 +481,6 @@ mi_string *doUpdateCN()
   DPRINTF("logger", 90, ("Exiting doUpdateCN()"));
   printf("\"DBNAME-TABLENAME-operation-TIME\": \"%s-%s-UPDATE-%s-Completed\" \n ", pdbname,ptabname,cdatetime);     
   free(cdatetime);
-  mi_free(oldRow);
-  mi_free(newRow);
-  mi_free(tid);
-  mi_free(lvarTid);
-  mi_free(td);
-  mi_free(rdOld);
-  mi_free(rdNew);
-  mi_free(ptabname);
-  mi_free(poldcolname);
-  mi_free(pnewcolname); 
-  mi_free(pcast);
-  mi_free(pcast2);
-  mi_free(pdbname);
   return(buffer);
 }
 /*--------------------------------------------------------------*/

informix_auditing/auditing2.c

@@ -64,7 +64,6 @@ void do_auditing2( mi_lvarchar *sessionusername, MI_FPARAM *fp)
   if (strcmp(mi_lvarchar_to_string(sessionusername), "ifxsyncuser") == 0)
   {
     printf("automated user. skipping trigger\n");
-    mi_free(sessionusername);
     return;
   }
   DPRINTF("logger", 80, ("Entering do_auditing2()"));
@@ -137,21 +136,11 @@ void do_auditing2( mi_lvarchar *sessionusername, MI_FPARAM *fp)
   if (pmem->gothandle == 0) {
 	  cbhandle = mi_register_callback(NULL, MI_EVENT_END_XACT, cbfunc,
 					  (void *)pmem, NULL);
-	  if (cbhandle == NULL) {
+	  if (cbhandle == NULL)
 		mi_db_error_raise(NULL, MI_EXCEPTION,
 						"Callback registration failed", NULL);
-                 }
-           else
-            {
-               mi_free(cbhandle);
-            }
       pmem->gothandle = 1;
   }
-  mi_free(pmem);
-  mi_free(pdata);
-  mi_free(sessionConnection);
-  mi_free(curChain);
-  mi_free(sessionusername);
   DPRINTF("logger", 80, ("Exiting do_auditing2()"));
   return;
 }
@@ -189,7 +178,7 @@ MI_CALLBACK_STATUS MI_PROC_CALLBACK
 			}
 			/* write the record out */
 			if (pcur == NULL) {
-        DPRINTF("logger", 80, ("cbfunc(): pcur is null"));
+DPRINTF("logger", 80, ("cbfunc(): pcur is null"));
             } else {
                           char filetime_buffer[30];
                           struct timeval file_tv;
@@ -199,11 +188,11 @@ MI_CALLBACK_STATUS MI_PROC_CALLBACK
                           strftime(filetime_buffer,30,"%m-%d-%Y_%T.",localtime(&file_curtime));
                           printf("%s%ld\n",filetime_buffer,file_tv.tv_usec);
 			  sprintf(buffer, "%s%d_%d_%s%ld.json", LOGGERFILEPREFIX,
-				pmem->sessionId, pcur->seq,filetime_buffer,file_tv.tv_usec);
-        DPRINTF("logger", 80, ("cbfunc(): about to open file %s", buffer));
+					pmem->sessionId, pcur->seq,filetime_buffer,file_tv.tv_usec);
+DPRINTF("logger", 80, ("cbfunc(): about to open file %s", buffer));
 			  fd = mi_file_open(buffer, O_WRONLY | O_APPEND | O_CREAT, 0644);
 			  if (pcur->json == NULL) {
-        DPRINTF("logger", 80, ("cbfunc(): pcur->json is null"));
+DPRINTF("logger", 80, ("cbfunc(): pcur->json is null"));
               } else {
 			  ret = mi_file_write(fd, pcur->json, strlen(pcur->json));
         int res=posttopic(pcur->json, "http://ifxpg-migrator.topcoder-dev.com/fileevents");
@@ -247,7 +236,6 @@ MI_CALLBACK_STATUS MI_PROC_CALLBACK
     DPRINTF("logger", 80, (buffer));
   }
   pmem->gothandle = 0;
-  mi_free(pmem);
   DPRINTF("logger", 80, ("Exiting cbfunc()"));
   return(MI_CB_CONTINUE);
 }