Changeset 45825a3 in thomson for elec/CrO2/software/Tape.cpp

Timestamp:

Jan 29, 2013, 9:11:50 PM (11 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

f7791a2

Parents:

65a4aad

Message:

Add some safety checks

git-svn-id: ​svn://localhost/thomson@31 85ae3b6b-dc8f-4344-a89d-598714f2e4e5

File:

• elec/CrO2/software/Tape.cpp (modified) (2 diffs)

elec/CrO2/software/Tape.cpp

@@ -12 +12 @@
 #include <string.h>
 #include <string>
+#include <stdexcept>
 
 Tape::~Tape()
@@ -21 +22 @@
 {
         std::string fnam(filename);
-        std::string fext(fnam.substr(fnam.length() - 3));
+        try {
+                std::string fext(fnam.substr(fnam.length() - 3));
 
-        // Load formats identified only by extension last
-        if (fext == "TAP" || fext == "tap");
-                return new ZXTAP(filename);
-        if (fext == ".K5" || fext == ".k5");
-                return new K5(filename);
+                // Load formats identified only by extension last
+                if (fext == "TAP" || fext == "tap");
+                        return new ZXTAP(filename);
+                if (fext == ".K5" || fext == ".k5");
+                        return new K5(filename);
+        } catch(std::out_of_range e) {}
         throw "Unable to guess tape format";
 }