Fixed segfault in explore discovery reporting (syllogism).

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@2295 c06c8d41-db1a-0410-9941-cceddc491573

4 files changed, 8 insertions, 6 deletions

diff --git a/crawl-ref/source/Kills.cc b/crawl-ref/source/Kills.cc
index b4446d980a..b3bad8d05f 100644
--- a/crawl-ref/source/Kills.cc
+++ b/crawl-ref/source/Kills.cc
@@ -376,7 +376,8 @@ static std::string n_names(const std::string &name, int n)
     {
         char buf[20];
         snprintf(buf, sizeof buf, "%d ", n);
-        return buf + pluralise(name, standard_plural_qualifiers, modifier_suffixes);
+        return buf + pluralise(name, standard_plural_qualifiers,
+                               modifier_suffixes);
     }
     else
         return article_a(name, false);
diff --git a/crawl-ref/source/libutil.cc b/crawl-ref/source/libutil.cc
index ef40fe2af3..586de1db77 100644
--- a/crawl-ref/source/libutil.cc
+++ b/crawl-ref/source/libutil.cc
@@ -242,7 +242,7 @@ std::string article_a(const std::string &name, bool lowercase)
 
 const char *standard_plural_qualifiers[] =
 {
-    " of ", " labeled "
+    " of ", " labeled ", NULL
 };
 
 // Pluralises a monster or item name. This'll need to be updated for
diff --git a/crawl-ref/source/libutil.h b/crawl-ref/source/libutil.h
index fc42023f70..751baef885 100644
--- a/crawl-ref/source/libutil.h
+++ b/crawl-ref/source/libutil.h
@@ -36,9 +36,10 @@ int strip_number_tag(std::string &s, const std::string &tagprefix);
 std::string strip_tag_prefix(std::string &s, const std::string &tagprefix);
 
 std::string article_a(const std::string &name, bool lowercase = true);
-std::string pluralise(const std::string &name,
-                      const char *stock_plural_quals[] = standard_plural_qualifiers,
-                      const char *no_of[] = NULL);
+std::string pluralise(
+    const std::string &name,
+    const char *stock_plural_quals[] = standard_plural_qualifiers,
+    const char *no_of[] = NULL);
 
 std::string number_in_words(unsigned number, int pow = 0);
 
diff --git a/crawl-ref/source/travel.cc b/crawl-ref/source/travel.cc
index 620d16068b..9648200892 100644
--- a/crawl-ref/source/travel.cc
+++ b/crawl-ref/source/travel.cc
@@ -3868,7 +3868,7 @@ std::vector<std::string> explore_discoveries::apply_quantities(
 {
     static const char *feature_plural_qualifiers[] =
     {
-        " leading ", " back to ", " to ", " of "
+        " leading ", " back to ", " to ", " of ", " in ", NULL
     };
     
     std::vector<std::string> things;