Changeset 1728

Timestamp:

01/03/08 20:28:10 (8 months ago)

Author:

peter

Message:

source/punch_fits.cpp:

Bug-fix - fix memory leak.

source/parse_table.cpp:
source/cdgetlinelist.cpp:
source/optimize_phymir.cpp:

Bug-fix - close open files.

source/cdinit.cpp:

Bug-fix - do not flush ioQQQ as it may not be open any longer.

source/cont_createpointers.cpp:

Bug-fix - fix out-of-bounds array access.

Location:

trunk/source

Files:

• cdgetlinelist.cpp (modified) (1 diff)
• cdinit.cpp (modified) (1 diff)
• cont_createpointers.cpp (modified) (1 diff)
• optimize_phymir.cpp (modified) (2 diffs)
• parse_table.cpp (modified) (1 diff)
• punch_fits.cpp (modified) (1 diff)

trunk/source/cdgetlinelist.cpp

@@ -143 +143 @@
         }
 
+        fclose( ioData );
+
         /* return number of lines we found */
         return nLines;

trunk/source/cdinit.cpp

@@ -250 +250 @@
                 fprintf(ioQQQ," cdEXIT called\n");
 
-        /* flush ioQQQ */
-        fflush( ioQQQ );
-
         /* close any open units */
         ClosePunchFiles( true );

trunk/source/cont_createpointers.cpp

@@ -176 +176 @@
                                         /* check that energy scales are the same, to within energy resolution of arrays */
 #                                       ifndef NDEBUG
-                                        if( Transitions[ipISO][nelem][ipHi][ipLo].Emis->ipFine >= 0 )
+                                        if( Transitions[ipISO][nelem][ipHi][ipLo].Emis->ipFine > 0 )
                                         {
                                                 realnum anuCoarse = rfield.anu[Transitions[ipISO][nelem][ipHi][ipLo].ipCont-1];

trunk/source/optimize_phymir.cpp

@@ -171 +171 @@
                         yp[0] = (realnum)optimize_func(xc);
                         wr_block(&yp[0],(size_t)sizeof(realnum),fnam1);
+                        fclose( ioQQQ );
                         cdEXIT(EXIT_SUCCESS);
                 }
@@ -291 +292 @@
                                         yp[jj] = (realnum)optimize_func(xhlp);
                                         wr_block(&yp[jj],(size_t)sizeof(realnum),fnam1);
+                                        fclose( ioQQQ );
                                         cdEXIT(EXIT_SUCCESS);
                                 }

trunk/source/parse_table.cpp

@@ -225 +225 @@
                 }
         }
+
+        fclose( ioFILE );
 
         {

trunk/source/punch_fits.cpp

@@ -718 +718 @@
                 bytesAdded += (long)fwrite( &tempInt, 1, 1,   ioFITS_OUTPUT );
         }
+
+        free( TransmittedSpectrum );
         return;
 }