Changeset 215b8d5 for zwrite.c

Timestamp:

Sep 30, 2011, 11:47:08 PM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Children:

9579509

Parents:

f89cc6f

git-author:

David Benjamin <davidben@mit.edu> (09/30/11 23:38:07)

git-committer:

David Benjamin <davidben@mit.edu> (09/30/11 23:47:08)

Message:

Cleanup in owl_zwrite_create on error cases

Before, the caller was required to cleanup, even on error. This is kind
of weird. In particular, owl_zwrite_create_and_send_from_line forgot to
so there was a small leak in there.

Also with the previous set of commits it's now possible to error from
owl_zwrite_create_from_line before the owl_zwrite is initialized, which
means that owl_zwrite_new_from_line on misquoted strings explodes. Oops.
Although I don't think this is actually possible to trigger.

Also be consistent about whether rv != 0 or rv < 0 is the error
condition. Barring any actual arguments one or another, I'm going to
arbitrary declare it's the former since that function doesn't really
have a useful number to return.

File:

• zwrite.c (modified) (5 diffs)

zwrite.c

@@ -4 +4 @@
 {
   owl_zwrite *z = g_new(owl_zwrite, 1);
-  if (owl_zwrite_create_from_line(z, line) < 0) {
-    owl_zwrite_delete(z);
+  if (owl_zwrite_create_from_line(z, line) != 0) {
+    g_free(z);
     return NULL;
   }
@@ -14 +14 @@
 {
   owl_zwrite *z = g_new(owl_zwrite, 1);
-  if (owl_zwrite_create(z, argc, argv) < 0) {
-    owl_zwrite_delete(z);
+  if (owl_zwrite_create(z, argc, argv) != 0) {
+    g_free(z);
     return NULL;
   }
@@ -135 +135 @@
 
   if (badargs) {
+    owl_zwrite_cleanup(z);
     return(-1);
   }
@@ -142 +143 @@
       z->recips->len == 0) {
     owl_function_error("You must specify a recipient for zwrite");
+    owl_zwrite_cleanup(z);
     return(-1);
   }
@@ -267 +269 @@
   owl_zwrite z;
   int rv;
-  rv=owl_zwrite_create_from_line(&z, cmd);
-  if (rv) return(rv);
+  rv = owl_zwrite_create_from_line(&z, cmd);
+  if (rv != 0) return rv;
   if (!owl_zwrite_is_message_set(&z)) {
     owl_zwrite_set_message(&z, msg);