Fix issue with synapse reports (#470)

jorblancoa · web-flow · commit 22b2ebb3ad5d · 2021-01-21T12:12:58.000+01:00
* synapse_id can be 0 and hence nrn_assert can fail
* assert for the nullptr first and then dereference the pointer
diff --git a/coreneuron/io/reports/report_handler.cpp b/coreneuron/io/reports/report_handler.cpp
@@ -284,10 +284,10 @@ VarsToReport ReportHandler::get_custom_vars_to_report(const NrnThread& nt,
             if ((nodes_to_gids[ml->nodeindices[j]] == gid) && report_variable) {
                 double* var_value =
                     get_var_location_from_var_name(report.mech_id, report.var_name.data(), ml, j);
-                const auto synapse_id = static_cast<int>(
-                    *get_var_location_from_var_name(report.mech_id, SYNAPSE_ID_MOD_NAME, ml, j));
+                double* synapse_id =
+                    get_var_location_from_var_name(report.mech_id, SYNAPSE_ID_MOD_NAME, ml, j);
                 nrn_assert(synapse_id && var_value);
-                to_report.emplace_back(synapse_id, var_value);
+                to_report.emplace_back(static_cast<int>(*synapse_id), var_value);
             }
         }
         if (!to_report.empty()) {

Original file line number	Diff line number	Diff line change
`@@ -284,10 +284,10 @@ VarsToReport ReportHandler::get_custom_vars_to_report(const NrnThread& nt,`
`284`	`284`	`if ((nodes_to_gids[ml->nodeindices[j]] == gid) && report_variable) {`
`285`	`285`	`double* var_value =`
`286`	`286`	`get_var_location_from_var_name(report.mech_id, report.var_name.data(), ml, j);`
`287`		`- const auto synapse_id = static_cast<int>(`
`288`		`- *get_var_location_from_var_name(report.mech_id, SYNAPSE_ID_MOD_NAME, ml, j));`
	`287`	`+ double* synapse_id =`
	`288`	`+ get_var_location_from_var_name(report.mech_id, SYNAPSE_ID_MOD_NAME, ml, j);`
`289`	`289`	`nrn_assert(synapse_id && var_value);`
`290`		`- to_report.emplace_back(synapse_id, var_value);`
	`290`	`+ to_report.emplace_back(static_cast<int>(*synapse_id), var_value);`
`291`	`291`	`}`
`292`	`292`	`}`
`293`	`293`	`if (!to_report.empty()) {`