Răsfoiți Sursa

* Port [3074] to 1.2.12
* Fix bug introduced from fixing #274 (in [2978])


svn: 3075

Bryan Drewery 20 ani în urmă
părinte
comite
bfd5dd9067
2 a modificat fișierele cu 7 adăugiri și 3 ștergeri
  1. 6 3
      doc/UPDATES
  2. 1 0
      src/conf.c

+ 6 - 3
doc/UPDATES

@@ -2,7 +2,10 @@ This is a summary of ChangeLog basically.
 Numbers expressed as '#12' are references to a ticket/bug posting which can be viewed at: http://xx.shatow.net
 Lines prefixed with '-' were disabled before release and are not finished, or are planned changes.
 
-1.2.11
+1.2.12 - http://wraith.shatow.net/milestone/1.2.12
+* Fix bug introduced from fixing #274
+
+1.2.11 - http://wraith.shatow.net/milestone/1.2.11
 * Fixed typo in help for .set/.conf/.channel
 * Fixed a bug in cmd_chattr with |m users. (fixes #267)
 * Suicide now removes userfile backups, most pid files, and crontab entries. (Fixes #125)
@@ -25,10 +28,10 @@ Lines prefixed with '-' were disabled before release and are not finished, or ar
 * Fix a segfault with ctcp-cloak. (fairly random) (fixes #285)
 * Fixed cmd_botset not making a bot grab a different capitalization of a nick. (fixes #283)
 * Hub nicks no longer show on leaf bots for partyline chat.
-* Hub bots can no longer being whois'd or match'd from leaf bots.
+* Hub bots can no longer be whois'd or match'd from leaf bots.
 * Disabled the process list checking.
 
-1.2.10 - http://tracker.shatow.net/milestone/1.2.10
+1.2.10 - http://wraith.shatow.net/milestone/1.2.10
 * Removed old references to '+/-manop' and '+/-nomop' for chaninfo in help file.
 * Fixed auth cmds not working in privmsg. (fixes #228)
 * Fixed a major security hole in cmdpass checking.

+ 1 - 0
src/conf.c

@@ -1213,6 +1213,7 @@ conf_bot *conf_getlocalhub(conf_bot *bots) {
     while (localhub && localhub->disabled)
       localhub = localhub->next;
 
+  if (!localhub) return NULL;
   return !localhub->disabled ? localhub : NULL;
 }