Changeset 595 for CMT/HEAD/source/cmt_fragment.cxx

Timestamp:

Dec 9, 2011, 1:45:45 PM (13 years ago)

Author:

rybkin

Message:

See C.L. 472

File:

• CMT/HEAD/source/cmt_fragment.cxx (modified) (3 diffs)

CMT/HEAD/source/cmt_fragment.cxx

@@ -428 +428 @@
   if (name == "") return (0);
   
-  locate ();
+  if (!locate ()) return 0;
 
   if (use == 0)
@@ -576 +576 @@
     (CmtError::get_error_name (CmtError::fragment_not_found)
      + ": " + name + " (declared by " + use->get_package_name () + ")");
+
+  path = "";
   return (false);
 }
@@ -661 +663 @@
   if (!locate ()) return (false);
 
-  out.read (path);
-
+  if (!out.read (path))
+    {
+      CmtError::set (CmtError::file_access_error, path);
+      return false;
+    }
+  
   Variable* var = 0;
   for (i = 0; i < variables; i++)