Changeset 70a76f3

Timestamp:

May 10, 2012, 1:25:06 AM (12 years ago)

Author:

GitHub Merge Button <merge-button@github.com>

Parents:

3442788 (diff), 2354e9a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 2354e9a5fabd3efa2825b96557715caa33ede671 into 3442788e25354f35073af4d491d81295f3110948

File:

• message.c (modified) (2 diffs)

message.c

@@ -881 +881 @@
       NULL
     };
-    char *out;
+    char *out = NULL;
     int rv;
     int status;
@@ -898 +898 @@
       }
       owl_message_set_body(m, out);
-      g_free(out);
-    } else if(out) {
-      g_free(out);
-    }
+    } else {
+      /* Replace the opcode. Otherwise the UI and other bits of code think the
+       * message was encrypted. */
+      owl_message_set_opcode(m, "failed-decrypt");
+    }
+    g_free(out);
   }