# HG changeset patch # User Alain Mazy # Date 1763011968 -3600 # Node ID 200edfa9891139917593ccecd83e558308bab669 # Parent c305e6e2bf08aaf5cfeaa75778dff18a00fa6ecb cppcheck: nullPointerOutOfMemory diff -r c305e6e2bf08 -r 200edfa98911 OrthancFramework/Sources/Images/PamReader.cpp --- a/OrthancFramework/Sources/Images/PamReader.cpp Thu Nov 13 06:29:37 2025 +0100 +++ b/OrthancFramework/Sources/Images/PamReader.cpp Thu Nov 13 06:32:48 2025 +0100 @@ -207,8 +207,17 @@ if (enforceAligned_) { if (alignedImageBuffer_ != NULL) + { free(alignedImageBuffer_); + } + alignedImageBuffer_ = malloc(pitch * height); + + if (alignedImageBuffer_ == NULL) + { + throw OrthancException(ErrorCode_NotEnoughMemory); + } + memcpy(alignedImageBuffer_, &content_[offset], pitch* height); content_ = ""; AssignWritable(format, width, height, pitch, alignedImageBuffer_); diff -r c305e6e2bf08 -r 200edfa98911 OrthancServer/Resources/RunCppCheck.sh --- a/OrthancServer/Resources/RunCppCheck.sh Thu Nov 13 06:29:37 2025 +0100 +++ b/OrthancServer/Resources/RunCppCheck.sh Thu Nov 13 06:32:48 2025 +0100 @@ -1,5 +1,5 @@ #!/bin/bash - +# note: this script was last tuned to run with cppcheck v2.17.1 set -ex CPPCHECK=cppcheck @@ -65,13 +65,10 @@ EOF -# TODO: re-enable nullPointerOutOfMemory - ${CPPCHECK} -j 8 --enable=all --quiet --std=c++11 \ --suppress=missingIncludeSystem \ --suppress=missingInclude \ --suppress=useStlAlgorithm \ - --suppress=nullPointerOutOfMemory \ --check-level=exhaustive \ --suppressions-list=/tmp/cppcheck-suppressions.txt \ -DBOOST_HAS_DATE_TIME=1 \