finish botched edit in zak.c

Gbp-Pq: Name finish-botched-edit-in-zak.c.patch

2 files changed, 19 insertions, 8 deletions

diff --git a/InOut/widgets.cpp b/InOut/widgets.cpp
index c50be84c..ca0ab0ae 100644
--- a/InOut/widgets.cpp
+++ b/InOut/widgets.cpp
@@ -3240,7 +3240,7 @@ extern "C" {
   {
       //char *text = p->itext->data;
       Fl_Box *o =  new Fl_Box((int)*p->ix, (int)*p->iy,
-                              (int)*p->iwidth, (int)*p->iheight, text);
+                              (int)*p->iwidth, (int)*p->iheight, strdup(text));
       widget_attributes(csound, o);
       Fl_Boxtype type;
       int itype = (int) *p->itype;
@@ -3324,6 +3324,7 @@ extern "C" {
       char *text = p->itext->data;
       ADDR_SET_VALUE v = widgetGlobals->AddrSetValue[(int) *p->ihandle];
       Fl_Widget *o = (Fl_Widget *) v.WidgAddress;
+      free((void*)o->label());
       o->label(text);
       return OK;
   }
@@ -3338,7 +3339,8 @@ extern "C" {
       Fl_Widget *o = (Fl_Widget *) v.WidgAddress;
       if (i<0 || i>csound->GetStrsmax(csound)) text = (char *) "???";
       else if ((text=csound->GetStrsets(csound,i))==NULL) text = (char *) "???";
-      o->label(text);
+      free((void*)o->label());
+      o->label(strdup(text));
       return OK;
   }
 
diff --git a/Opcodes/zak.c b/Opcodes/zak.c
index ae3619ec..de10b99e 100644
--- a/Opcodes/zak.c
+++ b/Opcodes/zak.c
@@ -177,10 +177,15 @@ int32_t zir(CSOUND *csound, ZKR *p)
 {
     /* See zkr() for more comments.  */
     int32_t    indx;
-    ZAK_GLOBALS* zak = (ZAK_GLOBALS*) p->zz;
+    ZAK_GLOBALS* zak;
 
-    if (UNLIKELY(zak == NULL))
-      return NOTOK;
+    if (UNLIKELY(zkset(csound, (ZKR*)p)!=OK))
+      return csound->InitError(csound, Str("No zk space: "
+                                           "zakinit has not been called yet."));
+    zak = (ZAK_GLOBALS*) p->zz;
+
+    /* if (UNLIKELY(zak == NULL)) */
+    /*   return NOTOK; */
     /* Check to see this index is within the limits of zk space. */
     indx = (int32_t) *p->ndx;
     if (UNLIKELY(indx > zak->zklast)) {
@@ -236,10 +241,14 @@ int32_t zkw(CSOUND *csound, ZKW *p)
 int32_t ziw(CSOUND *csound, ZKW *p)
 {
     int32_t    indx;
-    ZAK_GLOBALS* zak = (ZAK_GLOBALS*) p->zz;
+    ZAK_GLOBALS* zak;
 
-    if (UNLIKELY(zak==NULL))
-      return NOTOK;
+    if (UNLIKELY(zkset(csound, (ZKR*)p)!= OK))
+      return csound->InitError(csound, Str("No zk space: "
+                                           "zakinit has not been called yet."));
+    zak = p->zz;
+    /* if (UNLIKELY(zak==NULL)) */
+    /*   return NOTOK; */
     indx = (int32_t) *p->ndx;
     if (UNLIKELY(indx > zak->zklast)) {
       return csound->InitError(csound, Str("ziw index > isizek. Not writing."));