Changeset 3103 for trunk

Timestamp:

09/06/16 12:59:48 (8 years ago)

Author:

Takeshi Nakazato

Message:

New Development: No

JIRA Issue: Yes CAS-8953

Ready for Test: Yes

Interface Changes: Yes/No

What Interface Changed: Please list interface changes

Test Programs: List test programs

Put in Release Notes: Yes/No

Module(s): Module Names change impacts.

Description:

Fixed wrong string copy.

File:

• trunk/external-alma/atnf/PKSIO/NROFITSDataset.cc (modified) (3 diffs)

trunk/external-alma/atnf/PKSIO/NROFITSDataset.cc

@@ -849 +849 @@
   string str24( 24, ' ' ) ;
 
-  strcpy( record_->LSFIL, str4.c_str() ) ;
+  for (auto i = 0u; i < 4u; ++i) {
+    record_->LSFIL[i] = ' ';
+  }
   status = readTable( record_->LSFIL, "LSFIL", 4, i ) ;
   if ( status ) {
@@ -878 +880 @@
   //cout << "LAVST(" << i << ") = " << record_->LAVST << endl ;
   //
-  strcpy( record_->SCANTP, str8.c_str() ) ; 
+  for (auto i = 0u; i < 8u; ++i) {
+    record_->SCANTP[i] = ' ';
+  }
     status = readTable( record_->SCANTP, "SCNTP", strlen(record_->SCANTP), i ) ;
   if ( status ) {
@@ -993 +997 @@
   //cout << "YY(" << i << ") = " << record_->YY << endl ;
   //
-  strcpy( record_->ARRYT, str4.c_str() ) ;
-  status = readTable( record_->ARRYT, "ARRYT", strlen(record_->ARRYT), i ) ;
-  for (int j = strlen(record_->ARRYT)-1 ; j >= 0 ; j--) {
+  for (auto i = 0u; i < 4u; ++i) {
+    record_->ARRYT[i] = ' ';
+  }
+  status = readTable( record_->ARRYT, "ARRYT", 4, i ) ;
+  for (int j = 3 ; j >= 0 ; j--) {
     if (record_->ARRYT[j] == ' ') record_->ARRYT[j] = '\0';
     else break;