- Fixed bug with ECB not stopping when no beam
- Fixed synchronisation issues - Fixed hsitogram memory writing from nxscript - Started module for writing SICS interfaces in Tcl - Fixed a bug in scan, which allowed to corrupt files - Fixed memory problems in napi5
This commit is contained in:
20
napi5.c
20
napi5.c
@@ -26,6 +26,7 @@
|
||||
#include <assert.h>
|
||||
#include <string.h>
|
||||
#include <time.h>
|
||||
#include "fortify.h"
|
||||
|
||||
typedef struct __NexusFile5 {
|
||||
struct iStack5 {
|
||||
@@ -322,7 +323,14 @@
|
||||
}
|
||||
/* release memory */
|
||||
NXI5KillDir (pFile);
|
||||
if(pFile->iCurrentLGG != NULL){
|
||||
free(pFile->iCurrentLGG);
|
||||
}
|
||||
if(pFile->iCurrentLD != NULL){
|
||||
free(pFile->iCurrentLD);
|
||||
}
|
||||
free (pFile);
|
||||
H5garbage_collect();
|
||||
*fid = NULL;
|
||||
return NX_OK;
|
||||
}
|
||||
@@ -476,6 +484,9 @@
|
||||
pFile->iStack5[pFile->iStackPtr].iVref=pFile->iCurrentG;
|
||||
strcpy(pFile->iStack5[pFile->iStackPtr].irefn,name);
|
||||
pFile->iAtt5.iCurrentIDX=0;
|
||||
if(pFile->iCurrentLGG != NULL){
|
||||
free(pFile->iCurrentLGG);
|
||||
}
|
||||
pFile->iCurrentLGG = strdup(name);
|
||||
NXI5KillDir (pFile);
|
||||
return NX_OK;
|
||||
@@ -766,6 +777,9 @@
|
||||
pFile->iCurrentS=0;
|
||||
return NX_ERROR;
|
||||
}
|
||||
if(pFile->iCurrentLD != NULL){
|
||||
free(pFile->iCurrentLD);
|
||||
}
|
||||
pFile->iCurrentLD = strdup(name);
|
||||
return NX_OK;
|
||||
}
|
||||
@@ -1018,6 +1032,7 @@
|
||||
/* int iRet; */
|
||||
herr_t status;
|
||||
int size_type;
|
||||
char buffer[1024];
|
||||
|
||||
pFile = NXI5assert (fid);
|
||||
if (pFile->iCurrentG == 0) { /* root level, can not link here */
|
||||
@@ -1030,9 +1045,10 @@
|
||||
strcpy(sLink->iTag5,pFile->name_ref);
|
||||
} else {
|
||||
/* group link */
|
||||
strcat(pFile->iCurrentLGG, sLink->iTag5);
|
||||
strcpy(buffer,pFile->iCurrentLGG);
|
||||
strcat(buffer, sLink->iTag5);
|
||||
strcpy(sLink->iTag5,"/");
|
||||
strcat(sLink->iTag5,pFile->iCurrentLGG);
|
||||
strcat(sLink->iTag5,buffer);
|
||||
}
|
||||
if (size_type>0)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user