Changeset 3385 in Sophya

Timestamp:

Nov 21, 2007, 6:59:05 PM (18 years ago)

Author:

ansari

Message:

protection pour I/O PPF de NDataBlock, lorsque taille (Size()) == 0, Reza 21/11/2007

Location:

trunk/SophyaLib/BaseTools

Files:

• fiondblock.cc (modified) (2 diffs)
• ndatablock.h (modified) (1 diff)
• segdatablock.h (modified) (1 diff)

trunk/SophyaLib/BaseTools/fiondblock.cc

@@ -145 +145 @@
 uint_8 itab[3];
 is.Get(itab, 3);
-if (dobj == NULL) dobj = new NDataBlock<T>(itab[1]);
-else if (itab[1] != dobj->Size()) dobj->ReSize(itab[1]);
+if (dobj == NULL) { 
+  if (itab[1] > 0) dobj = new NDataBlock<T>(itab[1]);
+  else dobj = new NDataBlock<T>(); 
+}
+else { 
+  if (itab[1] != dobj->Size()) { 
+    if (itab[1] > 0)  dobj->ReSize(itab[1]);
+    else dobj->Dealloc(); 
+  }
+}
+if (dobj->Size() < 1)  return;  // Pas de donnees a lire ...
 // On lit le tableau de nombres
 if (is.Version() <= 2)   // lecture ancienne version PPF
@@ -166 +175 @@
 os.Put(itab, 3);
 //  On ecrit le tableau de nombres 
-os.Put(dobj->Data(), dobj->Size());
+if (dobj->Size() > 0)   // On ecrit les donnees, s'il y en a ... (sz>0)
+  os.Put(dobj->Data(), dobj->Size());
 }
 

trunk/SophyaLib/BaseTools/ndatablock.h

@@ -152 +152 @@
 
   //! Return thye associated object Id (or DataRef Id)
-  inline uint_8 DRefId() { return mSRef->dsid; }
+  inline uint_8 DRefId() { return ((mSRef)?mSRef->dsid:0); }
   //! assign a new object Id (or DataRef Id) - useful for PPF write operations 
-  inline void RenewDRefId() { mSRef->dsid = AnyDataObj::getUniqueId(); } 
+  inline void RenewDRefId() { if (mSRef) mSRef->dsid = AnyDataObj::getUniqueId(); } 
   //! assign a new object Id (or DataRef Id) - useful for PPF write operations 
-  inline void RenewObjId() { mSRef->dsid = AnyDataObj::getUniqueId(); }
+  inline void RenewObjId() { if (mSRef) mSRef->dsid = AnyDataObj::getUniqueId(); }
   
 

trunk/SophyaLib/BaseTools/segdatablock.h

@@ -244 +244 @@
 
   //! Returns the unique object identifier 
-  inline uint_8 DRefId() const { return mSRef->dsid; }
+  inline uint_8 DRefId() const { return ((mSRef)?mSRef->dsid:0); }
 
 protected: