Changeset 865a39d3 in tol

Timestamp:

Aug 3, 2015, 2:59:16 PM (11 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

54e903c

Parents:

05325a3

Message:

refs #1866, resolviendo quejas de valgrind en tol 64 bits

...

==6545== Conditional jump or move depends on uninitialised value(s)
==6545==    at 0xAC53A37: vfprintf (in /usr/lib64/libc-2.18.so)
==6545==    by 0xAC7869A: vsprintf (in /usr/lib64/libc-2.18.so)
==6545==    by 0x5FF9FCB: BZipStream::Print(char const*, ...) (oisstream_zip.cpp:406)
==6545==    by 0x6004F5F: BOisCreator::WriteHeader() (oisxml.cpp:221)

...

==6545==  Uninitialised value was created by a stack allocation
==6545==    at 0x6003233: BOisCreator::WriteHeader() (oisxml.cpp:40)
==6545== 

...

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@6804 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tol/OIS

Files:

• oisxml.cpp (modified) (5 diffs)
• tol_oiscreator.h (modified) (1 diff)
• tol_oisloader.h (modified) (1 diff)

tol/OIS/oisxml.cpp

@@ -45 +45 @@
 
   header_->Print("<xmlParam>\n");
-  header_->Print("<maxXmlStrLen>%ld</maxXmlStrLen>\n",            xmlParam_.maxXmlStrLen_);
+  header_->Print("<maxXmlStrLen>%d</maxXmlStrLen>\n",            xmlParam_.maxXmlStrLen_);
   header_->Print("</xmlParam>\n");
 
@@ -115 +115 @@
 
   header_->Print("<tolSourceSearchPaths>\n");
-  header_->Print("<entries>%ld</entries>\n", options_.tolSourceSearchPaths_.Size());
+  header_->Print("<entries>%d</entries>\n", options_.tolSourceSearchPaths_.Size());
   for(n=0; n<options_.tolSourceSearchPaths_.Size(); n++)
   {
     options_.tolSourceSearchPaths_[n].value_ = GetStandardAbsolutePath(options_.tolSourceSearchPaths_[n].value_);
-    header_->Print("<root_%ld><alias>%s</alias><path>%s</path></root_%ld>\n", 
+    header_->Print("<root_%d><alias>%s</alias><path>%s</path></root_%d>\n", 
             n+1,
             options_.tolSourceSearchPaths_[n].alias_.String(),
@@ -169 +169 @@
         value += Text(tolEnvironment_[n]);
       }
-      header_->Print("<var_%ld><type>%s</type><name>%s</name><value>%s</value></var_%ld>\n", 
+      header_->Print("<var_%d><type>%s</type><name>%s</name><value>%s</value></var_%d>\n", 
               n+1,
               tolEnvironment_[n]->Grammar()->Name().String(), 
@@ -214 +214 @@
         }
       }
-      header_->Print("<file_%ld><path>%s</path><release>%s</release><size>%"_LLD64_"</size></file_%ld>\n", 
+      header_->Print("<file_%d><path>%s</path><release>%s</release><size>%"_LLD64_"</size></file_%d>\n", 
                      n+1,
                      path.String(), 
@@ -229 +229 @@
   {
     BText name = packages_[n];
-    header_->Print("<package_%ld>%s</package_%ld>\n", 
+    header_->Print("<package_%d>%s</package_%d>\n", 
                    n+1,
                    name.String(), 

tol/OIS/tol_oiscreator.h

@@ -67 +67 @@
   bool Write(const          BINT64&  x, BStream* stream);
   bool Write(const unsigned BINT64&  x, BStream* stream);
+  // REVIEW: for compatibility size_t will be written/read as 4 bytes
+  bool Write(const          size_t&  x, BStream* stream)
+  {
+    unsigned int _x = (unsigned int)x;
+    return this->Write( _x, stream );
+  }
   bool Write(const          float&   x, BStream* stream);
   bool Write(const          double&  x, BStream* stream);

tol/OIS/tol_oisloader.h

@@ -102 +102 @@
   bool Read(         BINT64&  x, BStream* stream);
   bool Read(unsigned BINT64&  x, BStream* stream);
+  // REVIEW: for compatibility size_t will be written/read as 4 bytes
+  bool Read(size_t &     x, BStream* stream)
+  {
+    unsigned int _x;
+    bool ok = this->Read( _x, stream );
+    if( ok )
+      {
+      x = _x;
+      }
+    return ok;
+  }
   bool Read(         float&   x, BStream* stream);
   bool Read(         double&  x, BStream* stream);