Changeset dacb555 for message.c

Timestamp:

Feb 9, 2010, 9:49:41 PM (14 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

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

Children:

a52eeb1

Parents:

d35d2ba

git-author:

Anders Kaseorg <andersk@mit.edu> (02/07/10 22:55:21)

git-committer:

Anders Kaseorg <andersk@mit.edu> (02/09/10 21:49:41)

Message:

zcrypt: Change zcrypt functions to allocate their output buffer.

The logic to determine the right buffer size is complicated and does
not belong in callers.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Reviewed-by: Nelson Elhage <nelhage@mit.edu>

File:

• message.c (modified) (1 diff)

message.c

@@ -841 +841 @@
   /* if zcrypt is enabled try to decrypt the message */
   if (owl_global_is_zcrypt(&g) && !strcasecmp(n->z_opcode, "crypt")) {
-    char *out;
-    int ret;
-
-    out=owl_malloc(strlen(owl_message_get_body(m))*16+20);
-    ret=owl_zcrypt_decrypt(out, owl_message_get_body(m), owl_message_get_class(m), owl_message_get_instance(m));
-    if (ret == 0)
+    char *out = owl_zcrypt_decrypt(owl_message_get_body(m), owl_message_get_class(m), owl_message_get_instance(m));
+    if (out) {
       owl_message_set_body(m, out);
-    owl_free(out);
+      owl_free(out);
+    }
   }
 #endif