Merge pull request #1151 from kephir4eg/master

Fix config file parsing

src/branches.cpp

@@ -80,11 +80,14 @@ namespace l
     uint64_t offset;
 
     offset = s_.find_first_not_of("+<>-=");
+    if (offset == std::string::npos) {
+      return;
+    }
+
     if(offset > 1)
       offset = 2;
     *instr_ = s_.substr(0,offset);
-    if(offset != std::string::npos)
-      *values_ = s_.substr(offset);
+    *values_ = s_.substr(offset);
   }
 
   static

tests/tests.cpp

@@ -86,6 +86,9 @@ test_config_branches()
   TEST_CHECK(b->minfreespace() == 1234);
   TEST_CHECK(b.to_string() == "");
 
+  // Parse initial value for branch
+  TEST_CHECK(b.from_string(b.to_string()) == 0);
+
   bcp0 = b;
   TEST_CHECK(b.from_string("/foo/bar") == 0);
   TEST_CHECK(b.to_string() == "/foo/bar=RW");