fix valgrind warnings

fangq · Sep 21, 2023 · 393c620 · 393c620
1 parent 1adb6c6
commit 393c620
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/mcx_utils.c b/src/mcx_utils.c
@@ -1758,15 +1758,15 @@ void mcx_prep_polarized(Config* cfg) {
  */
 
 void mcx_prepdomain(char* filename, Config* cfg) {
-    if (cfg->isdumpjson == 2) {
-        mcx_savejdata(cfg->jsonfile, cfg);
-        exit(0);
-    }
-
     if (filename[0] || cfg->vol) {
         if (cfg->vol == NULL) {
             mcx_loadvolume(filename, cfg, 0);
 
+            if (cfg->isdumpjson == 2) {
+                mcx_savejdata(cfg->jsonfile, cfg);
+                exit(0);
+            }
+
             if (cfg->shapedata && strstr(cfg->shapedata, ":") != NULL) {
                 int status;
 
@@ -2709,7 +2709,11 @@ int mcx_loadjson(cJSON* root, Config* cfg) {
         }
 
         if (!flagset['B']) {
-            strncpy(cfg->bc, FIND_JSON_KEY("BCFlags", "Session.BCFlags", Session, cfg->bc, valuestring), 12);
+            char* bc = FIND_JSON_KEY("BCFlags", "Session.BCFlags", Session, NULL, valuestring);
+
+            if (bc) {
+                strncpy(cfg->bc, bc, 12);
+            }
         }
 
         if (!flagset['b']) {

diff --git a/src/pybind11 b/src/pybind11
+65 −61		.clang-tidy
+5 −3		.github/CONTRIBUTING.md
+0 −4		.github/dependabot.yml
+40 −23		.github/workflows/ci.yml
+1 −1		.github/workflows/configure.yml
+6 −4		.github/workflows/format.yml
+7 −5		.github/workflows/pip.yml
+3 −3		.github/workflows/upstream.yml
+14 −11		.pre-commit-config.yaml
+13 −0		CMakeLists.txt
+3 −0		docs/_static/css/custom.css
+0 −11		docs/_static/theme_overrides.css
+2 −2		docs/advanced/cast/custom.rst
+3 −3		docs/advanced/cast/stl.rst
+2 −2		docs/advanced/classes.rst
+2 −2		docs/advanced/pycpp/numpy.rst
+1 −1		docs/advanced/smart_ptrs.rst
+160 −12		docs/changelog.rst
+1 −1		docs/classes.rst
+6 −17		docs/conf.py
+ −		docs/pybind11-logo.png
+4 −3		docs/requirements.txt
+5 −3		include/pybind11/attr.h
+5 −5		include/pybind11/cast.h
+23 −30		include/pybind11/detail/class.h
+21 −2		include/pybind11/detail/common.h
+1 −1		include/pybind11/detail/init.h
+1 −0		include/pybind11/detail/internals.h
+0 −66		include/pybind11/detail/type_caster_base.h
+9 −3		include/pybind11/detail/typeid.h
+17 −6		include/pybind11/eigen.h
+56 −32		include/pybind11/embed.h
+2 −2		include/pybind11/functional.h
+1 −1		include/pybind11/iostream.h
+19 −8		include/pybind11/numpy.h
+44 −26		include/pybind11/pybind11.h
+338 −64		include/pybind11/pytypes.h
+6 −6		include/pybind11/stl.h
+16 −6		noxfile.py
+2 −1		pybind11/__init__.py
+8 −1		pybind11/__main__.py
+1 −1		pybind11/_version.py
+12 −0		pybind11/commands.py
+2 −1		setup.cfg
+1 −0		setup.py
+1 −0		tests/CMakeLists.txt
+14 −1		tests/conftest.py
+51 −0		tests/cross_module_interleaved_error_already_set.cpp
+68 −58		tests/extra_python_package/test_files.py
+25 −0		tests/pybind11_tests.cpp
+1 −1		tests/requirements.txt
+8 −2		tests/test_builtin_casters.cpp
+2 −2		tests/test_constants_and_functions.cpp
+7 −7		tests/test_custom_type_casters.cpp
+5 −2		tests/test_eigen.cpp
+7 −0		tests/test_eigen.py
+1 −1		tests/test_embed/CMakeLists.txt
+47 −2		tests/test_exceptions.cpp
+99 −3		tests/test_exceptions.py
+10 −1		tests/test_kwargs_and_defaults.cpp
+21 −9		tests/test_methods_and_attributes.py
+2 −0		tests/test_modules.cpp
+30 −0		tests/test_modules.py
+1 −1		tests/test_numpy_array.cpp
+1 −1		tests/test_numpy_dtypes.cpp
+1 −1		tests/test_numpy_vectorize.cpp
+183 −0		tests/test_pytypes.cpp
+129 −0		tests/test_pytypes.py
+2 −2		tests/test_smart_ptr.cpp
+15 −8		tests/test_stl.cpp
+2 −2		tests/test_tagbased_polymorphic.cpp
+2 −3		tests/test_virtual_functions.cpp
+21 −11		tools/FindPythonLibsNew.cmake
+23 −0		tools/JoinPaths.cmake
+7 −0		tools/pybind11.pc.in
+3 −1		tools/pybind11NewTools.cmake
+32 −11		tools/pybind11Tools.cmake
+2 −0		tools/setup_global.py.in
+2 −0		tools/setup_main.py.in