Commit 8d7d617
authored
neuronapi: return nullptr from nrn_symbol_dataptr for non-scalar symbols (#3821)
Follow-up to #3815. nrn_symbol_dataptr returned sym->u.pval for any
symbol that was not a NOTUSER scalar, so asking for the dataptr of a
symbol with no double storage -- a function such as finitialize, a
top-level objref or strdef, or a section-level property (nseg/L/Ra/
rallbranch) -- handed back a reinterpreted union member (an Object*,
char*, function pointer, or a {type, index} pair) that dereferences to
garbage.
Return nullptr for those instead. The function now yields a real double*
only for a scalar/array VAR (USERDOUBLE, the typed USERINT/USERFLOAT that
alias sym->u.pval, and NOTUSER whose storage lives in the top-level
object-data array) and nullptr for everything else.
Extends test/api/global_scalar.cpp with the nullptr cases (null symbol,
finitialize, a top-level objref and strdef, and L) and updates the
capi.rst return doc to state the failure behavior.1 parent 61cb128 commit 8d7d617
3 files changed
Lines changed: 54 additions & 13 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
742 | 742 | | |
743 | 743 | | |
744 | 744 | | |
745 | | - | |
746 | | - | |
| 745 | + | |
| 746 | + | |
| 747 | + | |
| 748 | + | |
747 | 749 | | |
748 | 750 | | |
749 | 751 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
258 | 258 | | |
259 | 259 | | |
260 | 260 | | |
261 | | - | |
262 | | - | |
263 | | - | |
264 | | - | |
265 | | - | |
266 | | - | |
267 | | - | |
268 | | - | |
269 | | - | |
270 | | - | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
| 273 | + | |
| 274 | + | |
| 275 | + | |
| 276 | + | |
| 277 | + | |
| 278 | + | |
271 | 279 | | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
| 285 | + | |
272 | 286 | | |
273 | | - | |
274 | 287 | | |
275 | 288 | | |
276 | 289 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
54 | 54 | | |
55 | 55 | | |
56 | 56 | | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
| 62 | + | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
57 | 83 | | |
58 | 84 | | |
0 commit comments