Changeset - r295:7c796c1cf1b0
« 294:cbe3ec
297:92b193 »
gravatar
deba@inf.elte.hu
deba@inf.elte.hu
Fix memory leak hazard If the constructor throws an exception, it should deallocate each dynamically allocated memory.
0 2 0
default
2 files changed with 56 insertions and 14 deletions:
lemon/lgf_reader.h
32
8
lemon/lgf_writer.h
24
6
↑ Collapse diff ↑
lemon/lgf_reader.h
Show white space 4 line context
... ... 
@@ -518,5 +518,8 @@
518 518 
        _use_nodes(false), _use_arcs(false),
519 519 
        _skip_nodes(false), _skip_arcs(false) {
520 
      if (!(*_is)) throw IoError("Cannot open file", fn);
520 
      if (!(*_is)) {
521 
        delete _is;
522 
        throw IoError("Cannot open file", fn);
523 
      }
521 524 
    }
522 525 

			




	...
	...
	
		
@@ -530,5 +533,8 @@


			




	530
	533
	
		
        _use_nodes(false), _use_arcs(false),


			




	531
	534
	
		
        _skip_nodes(false), _skip_arcs(false) {


			




	532
	
	
		
      if (!(*_is)) throw IoError("Cannot open file", fn);


			




	
	535
	
		
      if (!(*_is)) {


			




	
	536
	
		
        delete _is;


			




	
	537
	
		
        throw IoError("Cannot open file", fn);


			




	
	538
	
		
      }


			




	533
	539
	
		
    }


			




	534
	540
	
		

			




	...
	...
	
		
@@ -1309,5 +1315,8 @@


			




	1309
	1315
	
		
        _use_nodes(false), _use_edges(false),


			




	1310
	1316
	
		
        _skip_nodes(false), _skip_edges(false) {


			




	1311
	
	
		
      if (!(*_is)) throw IoError("Cannot open file", fn);


			




	
	1317
	
		
      if (!(*_is)) {


			




	
	1318
	
		
        delete _is;


			




	
	1319
	
		
        throw IoError("Cannot open file", fn);


			




	
	1320
	
		
      }


			




	1312
	1321
	
		
    }


			




	1313
	1322
	
		

			




	...
	...
	
		
@@ -1321,5 +1330,8 @@


			




	1321
	1330
	
		
        _use_nodes(false), _use_edges(false),


			




	1322
	1331
	
		
        _skip_nodes(false), _skip_edges(false) {


			




	1323
	
	
		
      if (!(*_is)) throw IoError("Cannot open file", fn);


			




	
	1332
	
		
      if (!(*_is)) {


			




	
	1333
	
		
        delete _is;


			




	
	1334
	
		
        throw IoError("Cannot open file", fn);


			




	
	1335
	
		
      }


			




	1324
	1336
	
		
    }


			




	1325
	1337
	
		

			




	...
	...
	
		
@@ -2095,5 +2107,8 @@


			




	2095
	2107
	
		
      : _is(new std::ifstream(fn.c_str())), local_is(true),


			




	2096
	2108
	
		
        _filename(fn) {


			




	2097
	
	
		
      if (!(*_is)) throw IoError("Cannot open file", fn);


			




	
	2109
	
		
      if (!(*_is)) {


			




	
	2110
	
		
        delete _is;


			




	
	2111
	
		
        throw IoError("Cannot open file", fn);


			




	
	2112
	
		
      }


			




	2098
	2113
	
		
    }


			




	2099
	2114
	
		

			




	...
	...
	
		
@@ -2104,5 +2119,8 @@


			




	2104
	2119
	
		
      : _is(new std::ifstream(fn)), local_is(true),


			




	2105
	2120
	
		
        _filename(fn) {


			




	2106
	
	
		
      if (!(*_is)) throw IoError("Cannot open file", fn);


			




	
	2121
	
		
      if (!(*_is)) {


			




	
	2122
	
		
        delete _is;


			




	
	2123
	
		
        throw IoError("Cannot open file", fn);


			




	
	2124
	
		
      }


			




	2107
	2125
	
		
    }


			




	2108
	2126
	
		

			




	...
	...
	
		
@@ -2387,5 +2405,8 @@


			




	2387
	2405
	
		
    LgfContents(const std::string& fn)


			




	2388
	2406
	
		
      : _is(new std::ifstream(fn.c_str())), local_is(true) {


			




	2389
	
	
		
      if (!(*_is)) throw IoError("Cannot open file", fn);


			




	
	2407
	
		
      if (!(*_is)) {


			




	
	2408
	
		
        delete _is;


			




	
	2409
	
		
        throw IoError("Cannot open file", fn);


			




	
	2410
	
		
      }


			




	2390
	2411
	
		
    }


			




	2391
	2412
	
		

			




	...
	...
	
		
@@ -2396,5 +2417,8 @@


			




	2396
	2417
	
		
    LgfContents(const char* fn)


			




	2397
	2418
	
		
      : _is(new std::ifstream(fn)), local_is(true) {


			




	2398
	
	
		
      if (!(*_is)) throw IoError("Cannot open file", fn);


			




	
	2419
	
		
      if (!(*_is)) {


			




	
	2420
	
		
        delete _is;


			




	
	2421
	
		
        throw IoError("Cannot open file", fn);


			




	
	2422
	
		
      }


			




	2399
	2423
	
		
    }


			




	2400
	2424
	
		

			




        

    

    

    

        

            

                

                    lemon/lgf_writer.h
                

                

                  
                  
                  
                  Show white space
                  4 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -464,5 +464,8 @@


			




	464
	464
	
		
      : _os(new std::ofstream(fn.c_str())), local_os(true), _digraph(digraph),


			




	465
	465
	
		
        _skip_nodes(false), _skip_arcs(false) {


			




	466
	
	
		
      if (!(*_os)) throw IoError("Cannot write file", fn);


			




	
	466
	
		
      if (!(*_os)) {


			




	
	467
	
		
        delete _os;


			




	
	468
	
		
        throw IoError("Cannot write file", fn);


			




	
	469
	
		
      }


			




	467
	470
	
		
    }


			




	468
	471
	
		

			




	...
	...
	
		
@@ -474,5 +477,8 @@


			




	474
	477
	
		
      : _os(new std::ofstream(fn)), local_os(true), _digraph(digraph),


			




	475
	478
	
		
        _skip_nodes(false), _skip_arcs(false) {


			




	476
	
	
		
      if (!(*_os)) throw IoError("Cannot write file", fn);


			




	
	479
	
		
      if (!(*_os)) {


			




	
	480
	
		
        delete _os;


			




	
	481
	
		
        throw IoError("Cannot write file", fn);


			




	
	482
	
		
      }


			




	477
	483
	
		
    }


			




	478
	484
	
		

			




	...
	...
	
		
@@ -1025,5 +1031,8 @@


			




	1025
	1031
	
		
      : _os(new std::ofstream(fn.c_str())), local_os(true), _graph(graph),


			




	1026
	1032
	
		
        _skip_nodes(false), _skip_edges(false) {


			




	1027
	
	
		
      if (!(*_os)) throw IoError("Cannot write file", fn);


			




	
	1033
	
		
      if (!(*_os)) {


			




	
	1034
	
		
        delete _os;


			




	
	1035
	
		
        throw IoError("Cannot write file", fn);


			




	
	1036
	
		
      }


			




	1028
	1037
	
		
    }


			




	1029
	1038
	
		

			




	...
	...
	
		
@@ -1035,5 +1044,8 @@


			




	1035
	1044
	
		
      : _os(new std::ofstream(fn)), local_os(true), _graph(graph),


			




	1036
	1045
	
		
        _skip_nodes(false), _skip_edges(false) {


			




	1037
	
	
		
      if (!(*_os)) throw IoError("Cannot write file", fn);


			




	
	1046
	
		
      if (!(*_os)) {


			




	
	1047
	
		
        delete _os;


			




	
	1048
	
		
        throw IoError("Cannot write file", fn);


			




	
	1049
	
		
      }


			




	1038
	1050
	
		
    }


			




	1039
	1051
	
		

			




	...
	...
	
		
@@ -1588,5 +1600,8 @@


			




	1588
	1600
	
		
    SectionWriter(const std::string& fn)


			




	1589
	1601
	
		
      : _os(new std::ofstream(fn.c_str())), local_os(true) {


			




	1590
	
	
		
      if (!(*_os)) throw IoError("Cannot write file", fn);


			




	
	1602
	
		
      if (!(*_os)) {


			




	
	1603
	
		
        delete _os;


			




	
	1604
	
		
        throw IoError("Cannot write file", fn);


			




	
	1605
	
		
      }


			




	1591
	1606
	
		
    }


			




	1592
	1607
	
		

			




	...
	...
	
		
@@ -1596,5 +1611,8 @@


			




	1596
	1611
	
		
    SectionWriter(const char* fn)


			




	1597
	1612
	
		
      : _os(new std::ofstream(fn)), local_os(true) {


			




	1598
	
	
		
      if (!(*_os)) throw IoError("Cannot write file", fn);


			




	
	1613
	
		
      if (!(*_os)) {


			




	
	1614
	
		
        delete _os;


			




	
	1615
	
		
        throw IoError("Cannot write file", fn);


			




	
	1616
	
		
      }


			




	1599
	1617
	
		
    }


			




	1600
	1618
	
		

			




        

    






    
    



    


    

     
    
0 comments (0 inline)