fix crash when getting with -data and node exists but has no data

flightaware · Jan 25, 2017 · 94ee03b · 94ee03b
1 parent 28558f0
commit 94ee03b
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/generic/zookeepertcl.c b/generic/zookeepertcl.c
@@ -1488,9 +1488,10 @@ zootcl_get_subcommand(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], ZOOAP
  return TCL_ERROR;
  }
  status = zsc->rc;
- if ((status == ZNONODE) && (dataVarObj != NULL)) {
- // node doesn't exist and they specified -data,
- // unset data var and version var if defined and
+ if (((status == ZNONODE) || (zsc->dataObj == NULL)) && (dataVarObj != NULL)) {
+ // node doesn't exist or contains no data
+ // and they specified -data, unset their
+ // specified data var and version var and
  // return 0 indicating no node
  Tcl_UnsetVar (interp, Tcl_GetString (dataVarObj), 0);
  if (versionVarObj != NULL) {