From fdbfd2c6fc3dc6267c1fa07b4e1f0f87b1a6d026 Mon Sep 17 00:00:00 2001
From: Ari Johnson <ari@theari.com>
Date: Fri, 11 Jul 2008 19:43:46 +0000
Subject: [PATCH] Re-order ooref calls in fun_speak (cherry picked from commit
 54c55b4e32918a969847af9f10518a0ffe503b91)

---
 src/funstr.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/funstr.c b/src/funstr.c
index a47d9b6..c90b1ee 100644
--- a/src/funstr.c
+++ b/src/funstr.c
@@ -2131,16 +2131,20 @@ FUNCTION(fun_speak)
   char *say_string;
   char *string;
   char rbuff[BUFFER_LEN];
+  BEGINOOREF_L
 
   speaker = match_thing(executor, args[0]);
   if (speaker == NOTHING || speaker == AMBIGUOUS) {
     safe_str(T(e_match), buff, bp);
+    ENDOOREF_L
     return;
   }
   speaker_str = unparse_dbref(speaker);
 
-  if (!args[1] || !*args[1])
+  if (!args[1] || !*args[1]) {
+    ENDOOREF_L
     return;
+  }
 
   string = args[1];
 
@@ -2149,7 +2153,6 @@ FUNCTION(fun_speak)
   else
     say_string = (char *) "says,";
 
-  BEGINOOREF_L
   if (nargs > 3) {
     if (args[3] != '\0') {
       /* we have a transform attr */
-- 
2.30.2