Fix index pointing outside the valid range message #396

trevorsandy · May 8, 2023 · 5ca9126 · 5ca9126
1 parent fb121c6
commit 5ca9126
Show file tree

Hide file tree

Showing 14 changed files with 38 additions and 35 deletions.
diff --git a/builds/linux/obs/PKGBUILD b/builds/linux/obs/PKGBUILD
@@ -2,7 +2,7 @@
 #  Last Update: July 19, 2020
 #  Copyright (C) 2017 - 2023 by Trevor SANDY
 pkgname=lpub3d
-pkgver=2.4.6.3304
+pkgver=2.4.6.3305
 pkgrel=1
 pkgdesc="An LDraw Building Instruction Editor"
 url="https://github.com/trevorsandy/lpub3d.git"

diff --git a/builds/linux/obs/alldeps/PKGBUILD b/builds/linux/obs/alldeps/PKGBUILD
@@ -2,7 +2,7 @@
 #  Last Update: July 19, 2020
 #  Copyright (C) 2017 - 2023 by Trevor SANDY
 pkgname=lpub3d
-pkgver=2.4.6.3304
+pkgver=2.4.6.3305
 pkgrel=1
 pkgdesc="An LDraw Building Instruction Editor"
 url="https://github.com/trevorsandy/lpub3d.git"

diff --git a/builds/linux/obs/alldeps/debian/changelog b/builds/linux/obs/alldeps/debian/changelog
@@ -1,5 +1,5 @@
-lpub3d (2.4.6.3304) debian; urgency=medium
+lpub3d (2.4.6.3305) debian; urgency=medium
 
-  * LPub3D version 2.4.6.193.3304_20230508 for Linux
+  * LPub3D version 2.4.6.194.3305_20230508 for Linux
 
- -- Trevor SANDY <trevor.sandy@gmail.com>  Mon, 08 May 2023 05:54:50 +0200
+ -- Trevor SANDY <trevor.sandy@gmail.com>  Mon, 08 May 2023 05:55:13 +0200
diff --git a/builds/linux/obs/alldeps/debian/lpub3d.dsc b/builds/linux/obs/alldeps/debian/lpub3d.dsc
@@ -2,7 +2,7 @@ Format: 1.0
 Source: lpub3d
 Binary: lpub3d
 Architecture: any
-Version: 2.4.6.3304
+Version: 2.4.6.3305
 Maintainer: Trevor SANDY <trevor.sandy@gmail.com>
 Homepage: https://trevorsandy.github.io/lpub3d/
 Standards-Version: 3.9.7

diff --git a/builds/linux/obs/alldeps/lpub3d.spec b/builds/linux/obs/alldeps/lpub3d.spec
@@ -120,7 +120,7 @@ BuildRequires: fdupes
 Summary: An LDraw Building Instruction Editor
 Name: lpub3d
 Icon: lpub3d.xpm
-Version: 2.4.6.3304
+Version: 2.4.6.3305
 Release: <B_CNT>%{?dist}
 URL: https://trevorsandy.github.io/lpub3d
 Vendor: Trevor SANDY
@@ -797,7 +797,7 @@ update-desktop-database || true
 %endif
 
 %changelog
-* Mon May 08 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3304
+* Mon May 08 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3305
 - LPub3D 2.4.4 enhancements and fixes - see RELEASE_NOTES for details
 
 * Tue May 31 2022 - trevor dot sandy at gmail dot com 2.4.4.2670

diff --git a/builds/linux/obs/debian/changelog b/builds/linux/obs/debian/changelog
@@ -1,5 +1,5 @@
-lpub3d (2.4.6.3304) debian; urgency=medium
+lpub3d (2.4.6.3305) debian; urgency=medium
 
-  * LPub3D version 2.4.6.193.3304_20230508 for Linux
+  * LPub3D version 2.4.6.194.3305_20230508 for Linux
 
- -- Trevor SANDY <trevor.sandy@gmail.com>  Mon, 08 May 2023 05:54:52 +0200
+ -- Trevor SANDY <trevor.sandy@gmail.com>  Mon, 08 May 2023 05:55:15 +0200
diff --git a/builds/linux/obs/debian/lpub3d.dsc b/builds/linux/obs/debian/lpub3d.dsc
@@ -2,7 +2,7 @@ Format: 1.0
 Source: lpub3d
 Binary: lpub3d
 Architecture: any
-Version: 2.4.6.3304
+Version: 2.4.6.3305
 Maintainer: Trevor SANDY <trevor.sandy@gmail.com>
 Homepage: https://trevorsandy.github.io/lpub3d/
 Standards-Version: 3.9.7

diff --git a/builds/linux/obs/lpub3d.spec b/builds/linux/obs/lpub3d.spec
@@ -82,7 +82,7 @@ BuildRequires: fdupes
 Summary: An LDraw Building Instruction Editor
 Name: lpub3d
 Icon: lpub3d.xpm
-Version: 2.4.6.3304
+Version: 2.4.6.3305
 Release: 1%{?dist}
 URL: https://trevorsandy.github.io/lpub3d
 Vendor: Trevor SANDY
@@ -313,7 +313,7 @@ update-desktop-database || true
 %endif
 
 %changelog
-* Mon May 08 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3304
+* Mon May 08 2023 - trevor.dot.sandy.at.gmail.dot.com 2.4.6.3305
 - LPub3D 2.4.4 enhancements and fixes - see RELEASE_NOTES for details
 
 * Tue May 31 2022 - trevor dot sandy at gmail dot com 2.4.4.2670

diff --git a/builds/utilities/version.info b/builds/utilities/version.info
@@ -1 +1 @@
-2 4 6 193 3304 a3aaa668a
+2 4 6 194 3305 fb121c69a
diff --git a/gitversion.pri b/gitversion.pri
@@ -41,7 +41,7 @@ equals(GIT_DIR, undefined) {
 
     # Check if we do not have a valid version number (i.e. no version tag found)
     isEmpty(GIT_VERSION) {
-        GIT_REVISION = 193
+        GIT_REVISION = 194
         GIT_SHA      = $$system($$GIT_BASE_COMMAND rev-parse --short HEAD 2> $$NULL_DEVICE)
         GIT_COMMIT   = $$system($$GIT_BASE_COMMAND rev-list --count HEAD 2> $$NULL_DEVICE)
         GIT_VERSION  = v$${VERSION}-$${GIT_REVISION}-$${GIT_SHA}
@@ -69,7 +69,7 @@ equals(GIT_DIR, undefined) {
         # Get commit count
         GIT_COMMIT = $$system($$GIT_BASE_COMMAND rev-list --count HEAD 2> $$NULL_DEVICE)
         isEmpty(GIT_COMMIT) {
-            GIT_COMMIT = 3304
+            GIT_COMMIT = 3305
             message("~~~ ERROR! GIT_COMMIT NOT DEFINED, USING $$GIT_COMMIT ~~~")
         }
 
@@ -117,7 +117,7 @@ if (equals(USE_GIT_VER_FILE, true)|equals(USE_VERSION_INFO_VAR, true)) {
             GIT_VERSION = $$cat($$GIT_VER_FILE, lines)
         } else {
             message("~~~ ERROR! $$GIT_DIR_ENV VERSION_INFO FILE $$GIT_VER_FILE NOT FOUND ~~~")
-            GIT_VERSION = $${VERSION}.193.3304.a3aaa668a
+            GIT_VERSION = $${VERSION}.194.3305.fb121c69a
             message("~~~ GIT_DIR [$$GIT_DIR_ENV, USING VERSION] $$GIT_VERSION ~~~")
             GIT_VERSION ~= s/\./" "
         }

diff --git a/mainApp/docs/README.txt b/mainApp/docs/README.txt
@@ -1,4 +1,4 @@
-LPub3D 2.4.6.193.3304 (08 05 2023 05:54:52)
+LPub3D 2.4.6.194.3305 (08 05 2023 05:55:15)
 
 Features, enhancements, fixes and changes
 ------------

diff --git a/mainApp/docs/RELEASE_NOTES.html b/mainApp/docs/RELEASE_NOTES.html
@@ -18,7 +18,7 @@
 <table class="tg">
   <tr>
     <th class="tg-0pky">
-      <h4><a id="LPub3D_0"></a>LPub3D 2.4.6.193.3304 (08 05 2023 05:54:52)</h4>
+      <h4><a id="LPub3D_0"></a>LPub3D 2.4.6.194.3305 (08 05 2023 05:55:15)</h4>
         <hr>
           <p>
              <span class="tg-1pky">LPub3D Official release.</span><br>

diff --git a/mainApp/extras/LPub3D_Npp_UDL.xml b/mainApp/extras/LPub3D_Npp_UDL.xml
@@ -14,8 +14,8 @@
 ;;
 ;; Author......: Trevor SANDY
 ;; Name........: LPub3D_Npp_UDL.xml
-;; Version.....: 2.4.6.193.3304
-;; Last Update.: Mon, 08 May 2023 05:54:52 +0200
+;; Version.....: 2.4.6.194.3305
+;; Last Update.: Mon, 08 May 2023 05:55:15 +0200
 ;; License.....: GPLv3
 ;; Homepage....: https://trevorsandy.github.io/lpub3d
 ;; Copyright (C) 2021 - 2023 by Trevor SANDY

diff --git a/mainApp/traverse.cpp b/mainApp/traverse.cpp
@@ -5275,14 +5275,15 @@ int Gui::include(Meta &meta, int &lineNumber, bool &includeFileFound)
     QFileInfo fileInfo(filePath);
     QString fileName = fileInfo.fileName();
 
-    auto processLine =
-            [this,
-             &meta,
-             &fileName,
-             &lineNumber] () {
+    auto processLine = [&] ()
+    {
         Rc prc = InvalidLineRc;
         Where here(fileName,lineNumber);
         QString line = readLine(here);
+
+        if (line.isEmpty())
+           return prc;
+
         switch (line.toLatin1()[0]) {
         case '1':
         case '2':
@@ -5338,16 +5339,18 @@ int Gui::include(Meta &meta, int &lineNumber, bool &includeFileFound)
     includeFileFound = lpub->ldrawFile.isIncludeFile(fileName);
 
     if (includeFileFound) {
-        updateMpdCombo();
         int numLines = lpub->ldrawFile.size(fileName);
-        for (; lineNumber < numLines; lineNumber++) {
-            rc = processLine();
-            // one line at a time so break at valid line
-            if (rc != InvalidLineRc)
-                break;
-        }
         if (lineNumber < numLines) {
-            lineNumber++;
+            // update MpdCombo at first line
+            if (!lineNumber)
+                updateMpdCombo();
+            // process one line at a time so break at valid line
+            for (;lineNumber < numLines;) {
+                rc = processLine();
+                lineNumber++;
+                if (rc != InvalidLineRc)
+                    break;
+            }
         } else {
             includeFileFound = false;
             rc = EndOfIncludeFileRc;