Fix crash in PING

Patch by Stuart Walsh, issue reported by Adam. Thanks!
oftc · Nov 27, 2016 · af44193 · af44193
1 parent a34c57e
commit af44193
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/configure.ac b/configure.ac
@@ -2,7 +2,7 @@
 # vim: set fdm=marker ts=2 sw=2 et:
 
 AC_PREREQ(2.59)
-AC_INIT([oftc-hybrid],[1.7.2])
+AC_INIT([oftc-hybrid],[1.7.3])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([libltdl/config])

diff --git a/include/patchlevel.h b/include/patchlevel.h
@@ -23,5 +23,5 @@
  */
 
 #ifndef PATCHLEVEL
-#define PATCHLEVEL   "hybrid-7.2.2+oftc1.7.2"
+#define PATCHLEVEL   "hybrid-7.2.2+oftc1.7.3"
 #endif
diff --git a/modules/m_ping.c b/modules/m_ping.c
@@ -89,7 +89,8 @@ m_ping(struct Client *client_p, struct Client *source_p,
     return;
   }
 
-  if (!EmptyString(destination) && irccmp(destination, me.name) != 0)
+  if (!EmptyString(destination) && irccmp(destination, me.name) != 0 &&
+      irccmp(destination, me.id) != 0)
   {
     /* We're sending it across servers.. origin == client_p->name --fl_ */
     origin = client_p->name;
@@ -139,7 +140,8 @@ ms_ping(struct Client *client_p, struct Client *source_p,
   origin = source_p->name;
   destination = parv[2]; /* Will get NULL or pointer (parc >= 2!!) */
 
-  if (!EmptyString(destination) && irccmp(destination, me.name) != 0 && irccmp(destination, me.id) != 0)
+  if (!EmptyString(destination) && irccmp(destination, me.name) != 0 &&
+      irccmp(destination, me.id) != 0)
   {
     if ((target_p = find_server(destination)))
       sendto_one(target_p,":%s PING %s :%s", parv[0],