Changeset 7bfc613

Timestamp:

Jul 12, 2010, 12:18:13 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

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

Children:

1cc9b615

Parents:

96582d5

Message:

Fix some bugs with 'zcrypt -C'

Files:

• functions.c (modified) (2 diffs)
• zwrite.c (modified) (1 diff)

functions.c

@@ -411 +411 @@
   }
 
-  owl_zwrite_set_message(z, cryptmsg);
+  owl_zwrite_set_message_raw(z, cryptmsg);
   owl_zwrite_set_opcode(z, "crypt");
-    
+
   owl_zwrite_send_message(z);
   owl_function_makemsg("Waiting for ack...");
@@ -420 +420 @@
   if (owl_zwrite_is_personal(z)) {
     /* Create the outgoing message. Restore the un-crypted message for display. */
-    owl_zwrite_set_message(z, old_msg);
+    owl_zwrite_set_message_raw(z, old_msg);
     m=owl_function_make_outgoing_zephyr(z);
     if (m) {

zwrite.c

@@ -199 +199 @@
 }
 
+/* Set the message with no post-processing*/
+void owl_zwrite_set_message_raw(owl_zwrite *z, const char *msg)
+{
+  if (z->message) owl_free(z->message);
+  z->message = owl_validate_utf8(msg);
+}
+
 void owl_zwrite_set_message(owl_zwrite *z, const char *msg)
 {