From b70c1e01a84f23f6dfd935e058817a67658b5fb5 Mon Sep 17 00:00:00 2001
From: Martin Panter <vadmium à gmail·com>
Date: Sat, 14 Jul 2012 17:38:50 +1000
Subject: [PATCH] Factor addition to block vector

---
 src/rararchive.cc | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/rararchive.cc b/src/rararchive.cc
index 931efb3..0e615c9 100644
--- a/src/rararchive.cc
+++ b/src/rararchive.cc
@@ -207,15 +207,16 @@ RARArchive::Parse(bool showcompressed)
 
 			file->seekg (-3, std::ios::cur);
 			
+			RARBlock* block = 0;
 			switch( buf[2] )
 			{
 				case 0x00:
 					break;
 				case RARBlock::MARKER:
-					blocks.push_back( new MarkerBlock(*file) );
+					block = new MarkerBlock(*file);
 					break;
 				case RARBlock::ARCHIVE:
-					blocks.push_back( new ArchiveBlock(*file) );
+					block = new ArchiveBlock(*file);
 					break;
 				case RARBlock::FILE:
 					FileBlock *f;
@@ -237,15 +238,18 @@ RARArchive::Parse(bool showcompressed)
 						}
 					}
 					
-					blocks.push_back( f );
+					block = f;
 					
 					break;
 				case RARBlock::SUB_3_00:
-					blocks.push_back(
-						new FileBlock(*file) );
+					block = new FileBlock(*file);
 					break;
 				default:
-					blocks.push_back( new RARBlock(*file) );
+					block = new RARBlock(*file);
+			}
+			if ( block )
+			{
+				blocks.push_back( block );
 			}
 		
 			if ( buf[2] == 0 || buf[2] == RARBlock::END ||
-- 
2.11.4.GIT