CDPP / DDServer

Commit 62ee0dc5ac129c2614b624bbad2a04ca20f3bc50

Authored by Elena.Budnik
1 parent a988bc05
Exists in master and in 10 other branches WIP, clean_real, create-user, epntap, evol_9042, fix-cdaweb, livraison-akka, sqlite_test, time-in-double, ubuntu

/EB - 19/01/16 - OUT of i-loop!!!

Showing 1 changed file with 7 additions and 2 deletions   Show diff stats
Inline Side-by-side
src/SERVER/DD_GetData.c
  Diff comments   View file @62ee0dc
@@ -307,8 +307,11 @@ int CloseID(int ID) @@ -307,8 +307,11 @@ int CloseID(int ID)
307 { 307 {
308 if (Verbose) fprintf(stderr,"CloseID(%d): %d, ptr %p\n",ID,i,DD_Var[ID]->VarData[il].Variables[i]); 308 if (Verbose) fprintf(stderr,"CloseID(%d): %d, ptr %p\n",ID,i,DD_Var[ID]->VarData[il].Variables[i]);
309 free(DD_Var[ID]->VarData[il].Variables[i]); 309 free(DD_Var[ID]->VarData[il].Variables[i]);
310 - DD_Var[ID]->VarData[il].VarNumber = 0; 310 + // DD_Var[ID]->VarData[il].VarNumber = 0;
311 } 311 }
  312 + //EB - 19/01/16 - OUT of i-loop!!!
  313 + DD_Var[ID]->VarData[il].VarNumber = 0;
  314 +
312 free(DD_Var[ID]->VarData[il].Dimensions); 315 free(DD_Var[ID]->VarData[il].Dimensions);
313 } 316 }
314 if(DD_Var[ID]->ParamSize > 0) free(DD_Var[ID]->VarData); 317 if(DD_Var[ID]->ParamSize > 0) free(DD_Var[ID]->VarData);
@@ -562,8 +565,10 @@ int GetAttribute(int ID, char *VarName) @@ -562,8 +565,10 @@ int GetAttribute(int ID, char *VarName)
562 { 565 {
563 //if (Verbose) fprintf(stderr," FREE ID = %d, il = %d, i = %d ptr %p\n",ID,il,i,DD_Var[ID]->VarData[il].Variables[i]); 566 //if (Verbose) fprintf(stderr," FREE ID = %d, il = %d, i = %d ptr %p\n",ID,il,i,DD_Var[ID]->VarData[il].Variables[i]);
564 free(DD_Var[ID]->VarData[il].Variables[i]); 567 free(DD_Var[ID]->VarData[il].Variables[i]);
565 - DD_Var[ID]->VarData[il].VarNumber = 0; 568 + // DD_Var[ID]->VarData[il].VarNumber = 0;
566 } 569 }
  570 + //EB - 19/01/16 - OUT of i-loop!!!
  571 + DD_Var[ID]->VarData[il].VarNumber = 0;
567 //BRE - 17/09/15 - Free variables !! 572 //BRE - 17/09/15 - Free variables !!
568 if(((DD_Var[ID]->LastPacketFlag == OK) || DD_Var[ID]->NewFile) && (DD_Var[ID]->VarData[il].Variables != NULL)) // Request been finished or 573 if(((DD_Var[ID]->LastPacketFlag == OK) || DD_Var[ID]->NewFile) && (DD_Var[ID]->VarData[il].Variables != NULL)) // Request been finished or
569 // System was trying to open new file 574 // System was trying to open new file