Merge pull request #391 from xlz/null-filename

floe · floe · commit e6aba11acd8e · 2015-09-15T20:11:45.000+02:00
Check NULL filename in the custom logger
diff --git a/examples/protonect/Protonect.cpp b/examples/protonect/Protonect.cpp
@@ -56,13 +56,14 @@ class MyFileLogger: public libfreenect2::Logger
   std::ofstream logfile_;
 public:
   MyFileLogger(const char *filename)
-    : logfile_(filename)
   {
+    if (filename)
+      logfile_.open(filename);
     level_ = Debug;
   }
   bool good()
   {
-    return logfile_.good();
+    return logfile_.is_open() && logfile_.good();
   }
   virtual void log(Level level, const std::string &message)
   {

Original file line number	Diff line number	Diff line change
`@@ -56,13 +56,14 @@ class MyFileLogger: public libfreenect2::Logger`
`56`	`56`	`std::ofstream logfile_;`
`57`	`57`	`public:`
`58`	`58`	`MyFileLogger(const char *filename)`
`59`		`- : logfile_(filename)`
`60`	`59`	`{`
	`60`	`+ if (filename)`
	`61`	`+ logfile_.open(filename);`
`61`	`62`	`level_ = Debug;`
`62`	`63`	`}`
`63`	`64`	`bool good()`
`64`	`65`	`{`
`65`		`- return logfile_.good();`
	`66`	`+ return logfile_.is_open() && logfile_.good();`
`66`	`67`	`}`
`67`	`68`	`virtual void log(Level level, const std::string &message)`
`68`	`69`	`{`