Changeset 1785 for trunk

Timestamp:

08/12/11 17:16:11 (6 months ago)

Author:

Freddie Akeroyd

Message:

Fix bug in NX5nativeisexternallink. Refs #311

Location:

trunk/src

Files:

• napi.c (modified) (2 diffs)
• napi5.c (modified) (3 diffs)

trunk/src/napi.c

@@ -1463 +1463 @@
   if(attStatus == NX_OK){
     length = strlen(nxurl);
-    if(length > urlLen){
+    if(length >= urlLen){
       length = urlLen - 1;
     }
@@ -1499 +1499 @@
   if(attStatus == NX_OK){
     length = strlen(nxurl);
-    if(length > urlLen){
+    if(length >= urlLen){
       length = urlLen - 1;
     }

trunk/src/napi5.c

@@ -2148 +2148 @@
      herr_t iRet;
      pNexusFile5 pFile;
-     char pBuffer[256]; 
      hid_t openwhere;
 
@@ -2200 +2199 @@
      H5L_info_t link_buff;
      char linkval_buff[1024];
-     const char *filepath, *objpath;
+     const char *filepath = NULL, *objpath = NULL;
+     size_t val_size;
 
      pFile = NXI5assert(fileid);
+     memset(url, 0, urllen);
 
      ret = H5Lget_info(pFile->iFID, name, &link_buff, H5P_DEFAULT);
@@ -2209 +2210 @@
      }
 
-     ret = H5Lget_val(pFile->iFID, name, linkval_buff, sizeof(linkval_buff), H5P_DEFAULT);
-     if (ret < 0) {
+     val_size = link_buff.u.val_size;
+     if (val_size > sizeof(linkval_buff)) {
+       NXReportError("ERROR: linkval_buff too small");
        return NX_ERROR;
      }
 
-     ret = H5Lunpack_elink_val(linkval_buff, sizeof(linkval_buff), 0, &filepath, &objpath);
-     if (ret < 0 || link_buff.type != H5L_TYPE_EXTERNAL) {
+     ret = H5Lget_val(pFile->iFID, name, linkval_buff, val_size, H5P_DEFAULT);
+     if (ret < 0) {
+       NXReportError("ERROR: H5Lget_val failed");
        return NX_ERROR;
      }
 
-    snprintf(url, urllen, "nxfile://%s#%s", filepath, objpath);
+     ret = H5Lunpack_elink_val(linkval_buff, val_size, NULL, &filepath, &objpath);
+     if (ret < 0) {
+       NXReportError("ERROR: H5Lunpack_elink_val failed");
+       return NX_ERROR;
+     }
+
+    snprintf(url, urllen-1, "nxfile://%s#%s", filepath, objpath);
     return NX_OK;