You shall not throw pointers - throw by value, catch by reference

adiesner · Jul 15, 2013 · bf831c8 · bf831c8
1 parent 6c773a5
commit bf831c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Fit2TcxConverter.cpp b/src/Fit2TcxConverter.cpp
@@ -293,7 +293,8 @@ void Fit2TcxConverter::handle_File_ID(FitMsg_File_ID *fileid) {
 			case FIT_FILE_MONITORING_DAILY:	type="MONITORING_DAILY"; break;
 			case FIT_FILE_INVALID: 			type="INVALID"; break;
 		}
-		throw new FitFileException("Wrong FIT file type. Expected ACTIVITY, but found: "+type);
+		FitFileException exc("Wrong FIT file type. Expected ACTIVITY, but found: "+type);
+		throw exc;
 	}
 
 	string manufacturer="Unknown";

diff --git a/src/garminFilebasedDevice.cpp b/src/garminFilebasedDevice.cpp
@@ -614,9 +614,8 @@ Thread-Status
 						} else {
 							Log::err("Not a fit file: " + workDir + "/" + files[i]);
 						}
-					} catch (FitFileException *e) {
-						Log::err("Exception: " + e->getError());
-						delete(e);
+					} catch (FitFileException &e) {
+						Log::err("Exception: " + e.getError());
 					} catch (...) {
 						Log::err("Unknown exception happened while reading fit file!");
 					}