Merge branch 'develop' of github.com:geekprojects/libgeek into develop

Author: DrFlibble

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,67 @@
+name: "CodeQL"
+
+on:
+  push:
+    branches: [develop]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [develop]
+  schedule:
+    - cron: '0 11 * * 3'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        # Override automatic language detection by changing the below list
+        # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
+        language: ['cpp']
+        # Learn more...
+        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
+
+    steps:
+    - name: Install dependencies
+      run: >
+        sudo apt-get update && 
+        sudo apt-get install  libxml2-dev libpng-dev libjpeg-dev libjpeg-turbo8 sqlite3 libsqlite-dev libsigc++-2.0-dev libfreetype6-dev
+
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # If this run was triggered by a pull request event, then checkout
+    # the head of the pull request instead of the merge commit.
+    - run: git checkout HEAD^2
+      if: ${{ github.event_name == 'pull_request' }}
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

CMakeLists.txt

@@ -50,6 +50,26 @@ string(REPLACE ";" " " PKGCONFIG_LDFLAGS "${PKGCONFIG_LDFLAGS_LIST}")
 configure_file(libgeek.pc.in libgeek.pc @ONLY)
 install(FILES ${CMAKE_BINARY_DIR}/libgeek.pc DESTINATION "lib${LIB_SUFFIX}/pkgconfig")
 
+
+#
+# Doxygen
+#
+find_package(Doxygen COMPONENTS dot)
+if (DOXYGEN_FOUND)
+    set(DOXYGEN_GENERATE_HTML YES)
+    set(DOXYGEN_GENERATE_MAN NO)
+    set(DOXYGEN_EXTRACT_ALL YES)
+
+    doxygen_add_docs(
+        doxygen
+        ${PROJECT_SOURCE_DIR}/include
+        COMMENT "Generate man pages"
+    )
+endif()
+
+#
+# CPack
+#
 include(InstallRequiredSystemLibraries)
 set(CPACK_PACKAGE_CONTACT "Ian Parker <[email protected]>")
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")

include/geek/gtk-chart.h

@@ -124,10 +124,12 @@ void Logger::logv(LoggerLevel_t level, const char* msg, va_list va)
 
     char timeStr[256];
     time_t t;
-    struct tm *tm;
     t = time(NULL);
-    tm = localtime(&t);
-    strftime(timeStr, 256, "%Y/%m/%d %H:%M:%S", tm);
+
+    struct tm tm;
+    localtime_r(&t, &tm);
+
+    strftime(timeStr, 256, "%Y/%m/%d %H:%M:%S", &tm);
 
     printf("%s: %s: %s: %s%s\n", timeStr, levelStr.c_str(), m_name.c_str(), spaces.c_str(), buf);
 }

include/geek/gtk-opengl.h

@@ -487,7 +487,7 @@ bool Drawable::blit(
 
     if (x == 0 && y == 0 && surface->getWidth() == getWidth() && surface->getHeight() == getHeight())
     {
-        memcpy(getDrawingBuffer(), surface->getDrawingBuffer(), getWidth() * getHeight() * 4);
+        memcpy(getDrawingBuffer(), surface->getDrawingBuffer(), (size_t)getWidth() * (size_t)getHeight() * 4l);
         return true;
     }