Make sure that functions that return null are checked.

From: Erik Hovland <erik@hovland.org>


---

 mythtv/libs/libmyth/mediamonitor-unix.cpp |    5 ++++-
 mythtv/libs/libmyth/util.cpp              |    3 +--
 2 files changed, 5 insertions(+), 3 deletions(-)


diff --git a/mythtv/libs/libmyth/mediamonitor-unix.cpp b/mythtv/libs/libmyth/mediamonitor-unix.cpp
index 43fc666..5f053e4 100644
--- a/mythtv/libs/libmyth/mediamonitor-unix.cpp
+++ b/mythtv/libs/libmyth/mediamonitor-unix.cpp
@@ -480,9 +480,12 @@ bool MediaMonitorUnix::AddDevice(struct fstab * mep)
     }
     else
     {
-        char *dev;
+        char *dev = 0;
         int len = 0;
         dev = strstr(mep->fs_mntops, SUPER_OPT_DEV);
+        if (dev == NULL)
+            return false;
+
         dev += sizeof(SUPER_OPT_DEV)-1;
         while (dev[len] != ',' && dev[len] != ' ' && dev[len] != 0)
             len++;
diff --git a/mythtv/libs/libmyth/util.cpp b/mythtv/libs/libmyth/util.cpp
index 6167227..e579db5 100644
--- a/mythtv/libs/libmyth/util.cpp
+++ b/mythtv/libs/libmyth/util.cpp
@@ -304,10 +304,9 @@ static QString getSystemTimeZoneID(void)
             struct tm *result = (struct tm *)malloc(sizeof(*result));
 
             t = time(NULL);
-            localtime_r(&t, result);
-
             if (result != NULL)
             {
+                localtime_r(&t, result);
                 if (strftime(name, sizeof(name), "%Z", result) > 0)
                     zone_id = name;
                 free(result);
