Changeset 96582d5 for functions.c

Timestamp:

Jul 8, 2010, 7:33:52 PM (14 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

7bfc613

Parents:

c43c77b

Message:

Fix a crash on 'zcrypt -m'.

File:

• functions.c (modified) (4 diffs)

functions.c

@@ -383 +383 @@
   char *zcrypt;
   int rv, status;
+  char *old_msg;
 
   /* create the zwrite and send the message */
@@ -389 +390 @@
     owl_zwrite_set_message(z, msg);
   }
-
+  old_msg = owl_strdup(owl_zwrite_get_message(z));
 
   zcrypt = owl_sprintf("%s/zcrypt", owl_get_bindir());
@@ -404 +405 @@
   if (rv || status) {
     if(cryptmsg) owl_free(cryptmsg);
+    owl_free(old_msg);
     owl_function_error("Error in zcrypt, possibly no key found.  Message not sent.");
     owl_function_beep();
@@ -418 +420 @@
   if (owl_zwrite_is_personal(z)) {
     /* Create the outgoing message. Restore the un-crypted message for display. */
-    owl_zwrite_set_message(z, msg);
+    owl_zwrite_set_message(z, old_msg);
     m=owl_function_make_outgoing_zephyr(z);
     if (m) {