Oops on invalid actor and victim arguments in nreport()

[empserver] / src / lib / subs / nreport.c

diff --git a/src/lib/subs/nreport.c b/src/lib/subs/nreport.c
index ff0d40dc344cb94c02a6678081e74e4d634f05a8..13216b88bf31dfb5a244590333d7577273ae8178 100644 (file)
--- a/src/lib/subs/nreport.c
+++ b/src/lib/subs/nreport.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,23 +19,28 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
  *  nreport.c: File a news report.  Downgrade relations if things get hostile.
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1994
  *     Steve McClure, 1997
+ *     Ron Koenderink, 2005
+ *     Markus Armbruster, 2004-2009
  */
 
-#include "prototypes.h"
-#include "news.h"
+#include <config.h>
+
 #include "file.h"
+#include "nat.h"
+#include "news.h"
 #include "optlist.h"
+#include "prototypes.h"
 
 #define SLOTS  5
 
@@ -54,10 +59,14 @@ void
 nreport(natid actor, int event, natid victim, int times)
 {
     int nice;
-    int rel;
-    struct natstr *natp;
     struct newscache *ncp;
 
+    if (CANT_HAPPEN((unsigned)event > N_MAX_VERB
+                   || rpt[event].r_newstory[0] == rpt[0].r_newstory[0]))
+       return;
+    if (CANT_HAPPEN(actor >= MAXNOC || victim >= MAXNOC))
+       return;
+
     ncp = ncache(actor, event, victim, times);
     putnews(ncp->id, &ncp->news);
 
@@ -75,19 +84,10 @@ nreport(natid actor, int event, natid victim, int times)
        return;
     if (!chance((double)-nice * times / 20.0))
        return;
-    if ((natp = getnatp(victim)) == 0)
-       return;
-    if ((rel = getrel(natp, actor)) < HOSTILE)
+    if (getrel(getnatp(victim), actor) < HOSTILE)
        return;
 
-    rel = HOSTILE;
-/*
-       if (rel > HOSTILE)
-               rel = HOSTILE;
-       else
-               rel = AT_WAR;
- */
-    setrel(victim, actor, rel);
+    setrel(victim, actor, HOSTILE);
 }
 
 /*
@@ -103,7 +103,7 @@ delete_old_news(void)
     /* skip over expired news */
     expiry_time = time(NULL) - days(news_keep_days);
     for (i = 0; getnews(i, &news); i++) {
-       if (news.nws_when == 0 || news.nws_when >= expiry_time)
+       if (news.nws_vrb == 0 || news.nws_when >= expiry_time)
            break;
     }
     /* news id 0..I-1 have expired */
@@ -114,7 +114,7 @@ delete_old_news(void)
 
     /* move unexpired news I.. to 0.., overwriting expired news */
     for (j = 0; getnews(i + j, &news); j++) {
-       if (news.nws_when == 0)
+       if (news.nws_vrb == 0)
            break;
        putnews(j, &news);
     }
@@ -122,9 +122,10 @@ delete_old_news(void)
     news_tail = j;
 
     /* mark slots no longer in use */
-    memset(&news, 0, sizeof(news));
-    for (k = 0; k < i; k++)
+    for (k = 0; k < i; k++) {
+       ef_blank(EF_NEWS, j + k, &news);
        putnews(j + k, &news);
+    }
 
     /* clear cache because moving news invalidated it */
     memset(&cache, 0, sizeof(cache));
@@ -141,7 +142,7 @@ init_nreport(void)
     struct nwsstr news;
 
     for (newest_item = 0; getnews(newest_item, &news); newest_item++) {
-       if (news.nws_when == 0)
+       if (news.nws_vrb == 0)
            break;
     }
     news_tail = newest_item;
@@ -155,10 +156,10 @@ init_nreport(void)
 static struct newscache *
 ncache(int actor, int event, int victim, int times)
 {
-    register struct newscache *np;
+    struct newscache *np;
     int i;
     int oldslot;
-    time_t oldtime;
+    time_t oldtime, dur;
     time_t now = time(NULL);
 
     oldslot = -1;
@@ -169,27 +170,30 @@ ncache(int actor, int event, int victim, int times)
            oldslot = i;
            oldtime = np->news.nws_when;
        }
-       if (np->id == 0)
+       if (np->news.nws_vrb == 0)
            continue;
-       if ((now - np->news.nws_when) > minutes(5))
+       dur = now - np->news.nws_when;
+       if (dur > minutes(5))
            continue;
        if (np->news.nws_vrb == event && np->news.nws_vno == victim &&
            np->news.nws_ntm + times <= 127) {
            np->news.nws_ntm += times;
+           np->news.nws_duration = dur;
            return np;
        }
     }
-    if (oldslot < 0) {
-       logerror("internal error; ncache oldslot < 0");
-       return &cache[actor][0];
-    }
+    if (CANT_HAPPEN(oldslot < 0))
+       oldslot = 0;
+    if (CANT_HAPPEN(!strstr(rpt[event].r_newstory[0], "%s") && victim != 0))
+       victim = 0;
     np = &cache[actor][oldslot];
+    ef_blank(EF_NEWS, news_tail, &np->news);
     np->news.nws_ano = actor;
-    np->news.nws_vno = victim;
-    np->news.nws_when = now;
     np->news.nws_vrb = event;
+    np->news.nws_vno = victim;
     np->news.nws_ntm = times;
-    ef_ensure_space(EF_NEWS, news_tail, 100);
+    np->news.nws_duration = 0;
+    np->news.nws_when = now;
     np->id = news_tail++;
     return np;
 }