Revision: 76918
http://sourceforge.net/p/brlcad/code/76918
Author: starseeker
Date: 2020-08-24 13:49:57 +0000 (Mon, 24 Aug 2020)
Log Message:
-----------
Fix dm pointer validation target, check result.
Modified Paths:
--------------
brlcad/trunk/src/mged/cmd.c
Modified: brlcad/trunk/src/mged/cmd.c
===================================================================
--- brlcad/trunk/src/mged/cmd.c 2020-08-24 13:40:30 UTC (rev 76917)
+++ brlcad/trunk/src/mged/cmd.c 2020-08-24 13:49:57 UTC (rev 76918)
@@ -1312,27 +1312,27 @@
for (BU_LIST_FOR (clp, cmd_list, &head_cmd_list.l)) {
bu_vls_trunc(&vls, 0);
if (clp->cl_tie) {
- if (dm_get_pathname(DMP)) {
- bu_vls_printf(&vls, "%s %s", bu_vls_addr(&clp->cl_name),
-
bu_vls_addr(dm_get_pathname(clp->cl_tie->dml_dmp)));
- Tcl_AppendElement(interpreter, bu_vls_addr(&vls));
+ struct bu_vls *pn = dm_get_pathname(clp->cl_tie->dml_dmp);
+ if (pn && bu_vls_strlen(pn)) {
+ bu_vls_printf(&vls, "%s %s", bu_vls_cstr(&clp->cl_name),
bu_vls_cstr(pn));
+ Tcl_AppendElement(interpreter, bu_vls_cstr(&vls));
}
} else {
- bu_vls_printf(&vls, "%s {}", bu_vls_addr(&clp->cl_name));
- Tcl_AppendElement(interpreter, bu_vls_addr(&vls));
+ bu_vls_printf(&vls, "%s {}", bu_vls_cstr(&clp->cl_name));
+ Tcl_AppendElement(interpreter, bu_vls_cstr(&vls));
}
}
bu_vls_trunc(&vls, 0);
if (clp->cl_tie) {
- if (dm_get_pathname(DMP)) {
- bu_vls_printf(&vls, "%s %s", bu_vls_addr(&clp->cl_name),
-
bu_vls_addr(dm_get_pathname(clp->cl_tie->dml_dmp)));
- Tcl_AppendElement(interpreter, bu_vls_addr(&vls));
+ struct bu_vls *pn = dm_get_pathname(clp->cl_tie->dml_dmp);
+ if (pn && bu_vls_strlen(pn)) {
+ bu_vls_printf(&vls, "%s %s", bu_vls_cstr(&clp->cl_name),
bu_vls_cstr(pn));
+ Tcl_AppendElement(interpreter, bu_vls_cstr(&vls));
}
} else {
- bu_vls_printf(&vls, "%s {}", bu_vls_addr(&clp->cl_name));
- Tcl_AppendElement(interpreter, bu_vls_addr(&vls));
+ bu_vls_printf(&vls, "%s {}", bu_vls_cstr(&clp->cl_name));
+ Tcl_AppendElement(interpreter, bu_vls_cstr(&vls));
}
bu_vls_free(&vls);
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
