Browse Source

[1470] Check for null filename before attempting to open master file

Stephen Morris 13 years ago
parent
commit
5dbdcfa0a3
1 changed files with 4 additions and 1 deletions
  1. 4 1
      src/lib/dns/masterload.cc

+ 4 - 1
src/lib/dns/masterload.cc

@@ -40,8 +40,11 @@ void
 masterLoad(const char* const filename, const Name& origin,
 masterLoad(const char* const filename, const Name& origin,
            const RRClass& zone_class, MasterLoadCallback callback)
            const RRClass& zone_class, MasterLoadCallback callback)
 {
 {
-    ifstream ifs;
+    if ((filename == NULL) || (*filename == '\0')) {
+        isc_throw(MasterLoadError, "Name of master file must not be null");
+    }
 
 
+    ifstream ifs;
     ifs.open(filename, ios_base::in);
     ifs.open(filename, ios_base::in);
     if (ifs.fail()) {
     if (ifs.fail()) {
         isc_throw(MasterLoadError, "Failed to open master file: " << filename);
         isc_throw(MasterLoadError, "Failed to open master file: " << filename);