From 5e75fe8836f117f6df5d0031ad653c4d0fb5c800 Mon Sep 17 00:00:00 2001
From: Guy Scharf <guy.oscar@moxis.com>
Date: Tue, 3 Nov 2020 14:50:04 -0700
Subject: [PATCH] Fix OSCAR crash when session not found in Journal file

While preparing bookmark HTML for right sidebar, OSCAR was trying to obtain
the first MT_JOURNAL session, but was finding a null pointer and then not checking
that the pointer was null. However, I don't know under what conditions this
situation could happen in the database.  At least now it won't crash OSCAR.
---
 oscar/mainwindow.cpp | 46 +++++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/oscar/mainwindow.cpp b/oscar/mainwindow.cpp
index d8fba199..799d5f86 100644
--- a/oscar/mainwindow.cpp
+++ b/oscar/mainwindow.cpp
@@ -1197,38 +1197,40 @@ void MainWindow::updateFavourites()
         if (journal) {
             if (journal->size() > 0) {
                 Session *sess = journal->firstSession(MT_JOURNAL);
-                QString tmp;
-                bool filtered = !bookmarkFilter.isEmpty();
-                bool found = !filtered;
+                if (sess) {
+                    QString tmp;
+                    bool filtered = !bookmarkFilter.isEmpty();
+                    bool found = !filtered;
 
-                if (sess->settings.contains(Bookmark_Start)) {
-                    //QVariantList start=sess->settings[Bookmark_Start].toList();
-                    //QVariantList end=sess->settings[Bookmark_End].toList();
-                    QStringList notes = sess->settings[Bookmark_Notes].toStringList();
+                    if (sess->settings.contains(Bookmark_Start)) {
+                        //QVariantList start=sess->settings[Bookmark_Start].toList();
+                        //QVariantList end=sess->settings[Bookmark_End].toList();
+                        QStringList notes = sess->settings[Bookmark_Notes].toStringList();
 
-                    if (notes.size() > 0) {
-                        tmp += QString("<tr><td><b><a href='daily=%1'>%2</a></b><br/>")
-                               .arg(date.toString(Qt::ISODate))
-                               .arg(date.toString(MedDateFormat));
+                        if (notes.size() > 0) {
+                            tmp += QString("<tr><td><b><a href='daily=%1'>%2</a></b><br/>")
+                                    .arg(date.toString(Qt::ISODate))
+                                    .arg(date.toString(MedDateFormat));
 
-                        tmp += "<list>";
+                            tmp += "<list>";
 
-                        for (int i = 0; i < notes.size(); i++) {
-                            //QDate d=start[i].toDate();
-                            QString note = notes[i];
+                            for (int i = 0; i < notes.size(); i++) {
+                                //QDate d=start[i].toDate();
+                                QString note = notes[i];
 
-                            if (filtered && note.contains(bookmarkFilter, Qt::CaseInsensitive)) {
-                                found = true;
+                                if (filtered && note.contains(bookmarkFilter, Qt::CaseInsensitive)) {
+                                    found = true;
+                                }
+
+                                tmp += "<li>" + note + "</li>";
                             }
 
-                            tmp += "<li>" + note + "</li>";
+                            tmp += "</list></td>";
                         }
-
-                        tmp += "</list></td>";
                     }
-                }
 
-                if (found) { html += tmp; }
+                    if (found) { html += tmp; }
+                }
             }
         }