Merge branch 'NetHack:NetHack-3.7' into test-actions

nhmall · web-flow · commit a8de188d0ba2 · 2025-01-28T09:27:25.000-05:00
diff --git a/DEVEL/nhgitset.pl b/DEVEL/nhgitset.pl
@@ -353,6 +353,7 @@ sub do_dir_hooksdir {
 
 sub do_file_nhgitset {
     my $infile = "DEVEL/nhgitset.pl";
+    $infile = "$DEVhooksdir/../nhgitset.pl" unless(-f $infile);
     my $outfile = ".git/hooks/gitsetdocs";
     open IN, "<", $infile or die "Can't open $infile:$!";
     open OUT, ">", $outfile or die "Can't open $outfile:$!";
diff --git a/doc/lua.adoc b/doc/lua.adoc
@@ -793,7 +793,7 @@ The hash parameter accepts the following keys:
 | adjacentok     | boolean | is adjacent location ok, if given one is not suitable?
 | ignorewater    | boolean | ignore water when choosing location for the monster
 | countbirth     | boolean | do we count this monster as generated
-| appear_as      | string | monster can appear as object, monster, or terrain. Add "obj:", "mon:", or "ter:" prefix to the value. |
+| appear_as      | string | monster can appear as object, monster, or terrain. Add "obj:", "mon:", or "ter:" prefix to the value.
 | inventory      | function | objects generated in the function are given to the monster (any random inventory it gets is discarded unless keep_default_invent is true)
 | keep_default_invent | boolean | if inventory is specified and this is true, those items are in addition to random inventory for this species; if inventory is not specified and this is false, monster gets no starting inventory
 |===
diff --git a/src/artifact.c b/src/artifact.c
@@ -35,6 +35,7 @@ staticfn uchar abil_to_adtyp(long *) NONNULLARG1;
 staticfn int glow_strength(int);
 staticfn boolean untouchable(struct obj *, boolean);
 staticfn int count_surround_traps(coordxy, coordxy);
+staticfn void dispose_of_orig_obj(struct obj *);
 
 /* The amount added to the victim's total hit points to insure that the
    victim will be killed even after damage bonus/penalty adjustments.
@@ -149,7 +150,8 @@ artiname(int artinum)
  */
 struct obj *
 mk_artifact(
-    struct obj *otmp,    /* existing object; ignored if alignment specified */
+    struct obj *otmp,    /* existing object; ignored and disposed of
+                          * if alignment specified */
     aligntyp alignment,  /* target alignment, or A_NONE */
     uchar max_giftvalue, /* cap on generated giftvalue */
     boolean adjust_spe)  /* whether to add spe to situational artifacts */
@@ -238,36 +240,62 @@ mk_artifact(
         a = &artilist[m];
 
         /* make an appropriate object if necessary, then christen it */
-        otmp = mksobj((int) a->otyp, TRUE, FALSE);
-
+        if (by_align) {
+            /* 'by_align' indicates that an alignment was passed as
+             * an argument, but also that the 'otmp' argument is not
+             * relevant */
+            struct obj *artiobj = mksobj((int) a->otyp, TRUE, FALSE);
+
+            /* nonnull value of 'otmp' is unexpected. Cope. */
+            if (otmp) /* just in case; avoid orphaning */
+                dispose_of_orig_obj(otmp);
+            otmp = artiobj;
+        }
+        /*
+         * otmp should be nonnull at this point:
+         * either the passed argument (if !by_align == A_NONE), or
+         * the result of mksobj() just above if by_align is an alignment. */
+        assert(otmp != 0);
+        /* prevent erosion from generating */
+        otmp->oeroded = otmp->oeroded2 = 0;
+        otmp = oname(otmp, a->name, ONAME_NO_FLAGS);
+        otmp->oartifact = m;  /* probably already set by this point, but */
+        /* set existence and reason for creation bits */
+        artifact_origin(otmp, ONAME_RANDOM); /* 'random' is default */
         if (adjust_spe) {
             int new_spe;
 
-            /* Adjust otmp->spe by a->gen_spe. (This is a no-op for
+            /* Adjust artiobj->spe by a->gen_spe. (This is a no-op for
                non-weapons, which always have a gen_spe of 0, and for many
                weapons, too.) The result is clamped into the "normal" range to
                prevent an outside chance of +12 artifacts generating. */
             new_spe = (int)otmp->spe + a->gen_spe;
             if (new_spe >= -10 && new_spe < 10)
                 otmp->spe = new_spe;
         }
-
-        if (otmp) {
-            /* prevent erosion from generating */
-            otmp->oeroded = otmp->oeroded2 = 0;
-            otmp = oname(otmp, a->name, ONAME_NO_FLAGS);
-            otmp->oartifact = m;
-            /* set existence and reason for creation bits */
-            artifact_origin(otmp, ONAME_RANDOM); /* 'random' is default */
-        }
     } else {
         /* nothing appropriate could be found; return original object */
-        if (by_align)
-            otmp = 0; /* (there was no original object) */
+        if (by_align && otmp) {
+            /* (there shouldn't have been an original object). Deal with it.
+             * The callers that passed an alignment and a NULL otmp are
+             * prepared to get a potential NULL return value, so this is okay */
+            dispose_of_orig_obj(otmp);
+            otmp = 0;
+        } /* otherwise, otmp has not changed; just fallthrough to return it */
     }
     return otmp;
 }
 
+staticfn void
+dispose_of_orig_obj(struct obj *obj)
+{
+    if (!obj)
+        return;
+
+    obj_extract_self(obj);
+    obfree(obj, (struct obj *) 0);
+}
+
 /*
  * Returns the full name (with articles and correct capitalization) of an
  * artifact named "name" if one exists, or NULL, it not.
diff --git a/src/dogmove.c b/src/dogmove.c
@@ -311,9 +311,16 @@ dog_eat(struct monst *mtmp,
     } else {
         /* It's a reward if it's DOGFOOD and the player dropped/threw it.
            We know the player had it if invlet is set. -dlc */
-        if (dogfood(mtmp, obj) == DOGFOOD && obj->invlet)
+        if (dogfood(mtmp, obj) == DOGFOOD && obj->invlet) {
             edog->apport += (int) (200L / ((long) edog->dropdist + svm.moves
                                            - edog->droptime));
+            if (edog->apport <= 0) {
+                impossible("dog_eat: pet apport <= 0 (%d, %d, %ld, %ld)",
+                            edog->apport, edog->dropdist, edog->droptime,
+                            svm.moves);
+                edog->apport = 1;
+            }
+        }
         if (obj->unpaid) {
             /* edible item owned by shop has been thrown or kicked
                by hero and caught by tame or food-tameable monst */
@@ -399,6 +406,7 @@ dog_invent(struct monst *mtmp, struct edog *edog, int udist)
      * Use udist+1 so steed won't cause divide by zero.
      */
     if (droppables(mtmp)) {
+        assert(edog->apport > 0);
         if (!rn2(udist + 1) || !rn2(edog->apport))
             if (rn2(10) < edog->apport) {
                 relobj(mtmp, (int) mtmp->minvis, TRUE);
diff --git a/src/lock.c b/src/lock.c
@@ -432,6 +432,14 @@ pick_lock(
         boolean it;
         int count;
 
+        /*
+         * FIXME:
+         *  (chest->otrapped && chest->tknown) is handled, to skip
+         *  checking for a trap and continue with asking about disarm;
+         *  (chest->tknown && !chest->otrapped) ignores tknown and will
+         *  ask about checking for non-existant trap.
+         */
+
         if (u.dz < 0 && !autounlock) { /* beware stale u.dz value */
             There("isn't any sort of lock up %s.",
                   Levitation ? "here" : "there");
diff --git a/src/mkobj.c b/src/mkobj.c
@@ -9,7 +9,7 @@ staticfn boolean may_generate_eroded(struct obj *);
 staticfn void mkobj_erosions(struct obj *);
 staticfn void mkbox_cnts(struct obj *);
 staticfn unsigned nextoid(struct obj *, struct obj *);
-staticfn void mksobj_init(struct obj *, boolean);
+staticfn void mksobj_init(struct obj **, boolean);
 staticfn int item_on_ice(struct obj *);
 staticfn void shrinking_glob_gone(struct obj *);
 staticfn void obj_timer_checks(struct obj *, coordxy, coordxy, int);
@@ -861,9 +861,10 @@ unknow_object(struct obj *obj)
 
 /* do some initialization to newly created object; otyp must already be set */
 staticfn void
-mksobj_init(struct obj *otmp, boolean artif)
+mksobj_init(struct obj **obj, boolean artif)
 {
     int mndx, tryct;
+    struct obj *otmp = *obj;
     char let = objects[otmp->otyp].oc_class;
 
     switch (let) {
@@ -880,8 +881,11 @@ mksobj_init(struct obj *otmp, boolean artif)
         if (is_poisonable(otmp) && !rn2(100))
             otmp->opoisoned = 1;
 
-        if (artif && !rn2(20 + (10 * nartifact_exist())))
+        if (artif && !rn2(20 + (10 * nartifact_exist()))) {
+            /* mk_artifact() with otmp and A_NONE will never return NULL */
             otmp = mk_artifact(otmp, (aligntyp) A_NONE, 99, TRUE);
+            *obj = otmp;
+        }
         break;
     case FOOD_CLASS:
         otmp->oeaten = 0;
@@ -1085,8 +1089,11 @@ mksobj_init(struct obj *otmp, boolean artif)
             otmp->spe = rne(3);
         } else
             blessorcurse(otmp, 10);
-        if (artif && !rn2(40 + (10 * nartifact_exist())))
+        if (artif && !rn2(40 + (10 * nartifact_exist()))) {
+            /* mk_artifact() with otmp and A_NONE will never return NULL */
             otmp = mk_artifact(otmp, (aligntyp) A_NONE, 99, TRUE);
+            *obj = otmp;
+        }
         /* simulate lacquered armor for samurai */
         if (Role_if(PM_SAMURAI) && otmp->otyp == SPLINT_MAIL
             && (svm.moves <= 1 || In_quest(&u.uz))) {
@@ -1176,7 +1183,7 @@ mksobj(int otyp, boolean init, boolean artif)
     otmp->pickup_prev = 0;
 
     if (init)
-        mksobj_init(otmp, artif);
+        mksobj_init(&otmp, artif);
 
     /* some things must get done (corpsenm, timers) even if init = 0 */
     switch ((otmp->oclass == POTION_CLASS && otmp->otyp != POT_OIL)
@@ -1231,8 +1238,10 @@ mksobj(int otyp, boolean init, boolean artif)
     }
 
     /* unique objects may have an associated artifact entry */
-    if (objects[otyp].oc_unique && !otmp->oartifact)
+    if (objects[otyp].oc_unique && !otmp->oartifact) {
+        /* mk_artifact() with otmp and A_NONE will never return NULL */
         otmp = mk_artifact(otmp, (aligntyp) A_NONE, 99, FALSE);
+    }
     otmp->owt = weight(otmp);
     return otmp;
 }
diff --git a/src/mplayer.c b/src/mplayer.c
@@ -261,6 +261,7 @@ mk_mplayer(struct permonst *ptr, coordxy x, coordxy y, boolean special)
                 otmp->oerodeproof = 1;
             else if (!rn2(2))
                 otmp->greased = 1;
+            /* mk_artifact() with otmp and A_NONE will never return NULL */
             if (special && rn2(2))
                 otmp = mk_artifact(otmp, A_NONE, 99, FALSE);
             /* usually increase stack size if stackable weapon */
diff --git a/src/objnam.c b/src/objnam.c
@@ -1338,7 +1338,11 @@ doname_base(
             Strcat(prefix, "uncursed ");
     }
 
-    /* "a large trapped box" would perhaps be more correct */
+    /* "a large trapped box" would perhaps be more correct; [no!]
+       what about ``(obj->tknown && !obj->otrapped)''? shouldn't that
+       yield "a non-trapped large box"? (not "an untrapped large box");
+       TODO: this should be ``(Is_box(obj) || obj->otyp == TIN) && ...''
+       but at present there's no way to set obj->tknown for tins */
     if (Is_box(obj) && obj->otrapped && obj->tknown && obj->dknown)
         Strcat(prefix,"trapped ");
     if (lknown && Is_box(obj)) {
@@ -2382,6 +2386,22 @@ Ysimple_name2(struct obj *obj)
     return s;
 }
 
+    /*
+     * FIXME:
+     *  simpleonames(), ansimpleoname(), and thesimpleoname() need to
+     *  know the beginning of the obuf[] they use so that they can
+     *  guard against buffer overflow when pluralizing (is that an
+     *  actual word?) or inserting "an" or "the".
+     *
+     *  minimal_xname() returns a call to xname() which writes into
+     *  the middle of its obuf[] then backs up to accomodate a prefix,
+     *  so BUFSZ is not a reliable limit for the length of the result.
+     *
+     *  [Overflow likely moot.  Since the formatted object name has
+     *  user-supplied name suppressed, the length is sure to be short
+     *  enough to added plural suffix or "an" or "the" prefix.]
+     */
+
 /* "scroll" or "scrolls" */
 char *
 simpleonames(struct obj *obj)
@@ -2407,8 +2427,6 @@ ansimpleoname(struct obj *obj)
     char *obufp, *simpleoname = simpleonames(obj);
     int otyp = obj->otyp;
 
-    if (strlen(simpleoname) > BUFSZ - sizeof "the ")
-        simpleoname[sizeof "the "] = '\0';
     /* prefix with "the" if a unique item, or a fake one imitating same,
        has been formatted with its actual name (we let minimal_xname() handle
        any `known' and `dknown' checking necessary) */
diff --git a/src/pray.c b/src/pray.c
@@ -1793,6 +1793,7 @@ bestow_artifact(uchar max_giftvalue)
 
     if (do_bestow) {
         struct obj *otmp;
+        /* mk_artifact() with NULL obj and a_align() arg can return NULL */
         otmp = mk_artifact((struct obj *) 0, a_align(u.ux, u.uy),
                            max_giftvalue, TRUE);
         if (otmp) {
diff --git a/src/restore.c b/src/restore.c
@@ -365,6 +365,10 @@ restmon(NHFILE *nhfp, struct monst *mtmp)
             newedog(mtmp);
             if (nhfp->structlevel)
                 Mread(nhfp->fd, EDOG(mtmp), sizeof (struct edog));
+            /* sanity check to prevent rn2(0) */
+           if (EDOG(mtmp)->apport <= 0) {
+               EDOG(mtmp)->apport = 1;
+           }
         }
         /* mcorpsenm - obj->corpsenm for mimic posing as corpse or
            statue (inline int rather than pointer to something) */
diff --git a/sys/share/pmatchregex.c b/sys/share/pmatchregex.c
@@ -1,4 +1,4 @@
-/* NetHack 3.7  pmatchregex.c	$NHDT-Date: 1596498285 2020/08/03 23:44:45 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.4 $ */
+/* NetHack 3.7  pmatchregex.c	$NHDT-Date: 1737691300 2025/01/23 20:01:40 $  $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.10 $ */
 /* Copyright (c) Sean Hunt  2015.                                 */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -59,11 +59,11 @@ regex_match(const char *s, struct nhregex *re)
 void
 regex_free(struct nhregex *re)
 {
-    if (re) {
-        if (re->pat)
-            free((genericptr_t) re->pat);
-        free((genericptr_t) re);
-    }
+    assert(re != NULL); /* regex_free() is declared with NONNULLPTR1 */
+
+    if (re->pat)
+        free((genericptr_t) re->pat);
+    free((genericptr_t) re);
 }
 
 /*pmatchregex.c*/
diff --git a/win/curses/cursdial.c b/win/curses/cursdial.c
@@ -449,7 +449,6 @@ curses_ext_cmd(void)
         letter = pgetchar(); /* pgetchar(cmd.c) implements do-again */
         curs_set(0);
         prompt_width = (int) strlen(cur_choice);
-        matches = 0;
 
         if (letter == '\033' || letter == ERR) {
             ret = -1;
@@ -667,7 +666,7 @@ curs_pad_menu(
     boolean do_pad UNUSED)
 {
     nhmenu_item *menu_item_ptr;
-    int numpages = current_menu->num_pages;
+    int numpages;
 
     /* caller has already called menu_win_size() */
     menu_determine_pages(current_menu); /* sets 'menu->num_pages' */
@@ -942,7 +941,7 @@ menu_is_multipage(nhmenu *menu, int width, int height)
     int curline = 0, accel_per_page = 0;
     nhmenu_item *menu_item_ptr = menu->entries;
 
-    if (*menu->prompt) {
+    if (menu->prompt && *menu->prompt) {
         curline += curses_num_lines(menu->prompt, width) + 1;
     }
 
@@ -978,13 +977,12 @@ menu_determine_pages(nhmenu *menu)
     int tmpline, num_lines, accel_per_page;
     int curline = 0;
     int page_num = 1;
-    nhmenu_item *menu_item_ptr = menu->entries;
+    nhmenu_item *menu_item_ptr;
     int width = menu->width;
     int height = menu->height;
     int page_end = height;
 
-
-    if (*menu->prompt) {
+    if (menu->prompt && *menu->prompt) {
         curline += curses_num_lines(menu->prompt, width) + 1;
     }
     tmpline = curline;
@@ -1032,6 +1030,7 @@ menu_win_size(nhmenu *menu)
     int maxheaderwidth = menu->prompt ? (int) strlen(menu->prompt) : 0;
     nhmenu_item *menu_item_ptr, *last_item_ptr = NULL;
 
+#if 0   /* maxwidth is set below, so the value calculated here isn't used */
     if (program_state.gameover) {
         /* for final inventory disclosure, use full width */
         maxwidth = term_cols - 2; /* +2: borders assumed */
@@ -1046,6 +1045,7 @@ menu_win_size(nhmenu *menu)
         if ((term_cols / 2) > maxwidth)
             maxwidth = (term_cols / 2); /* Half the screen */
     }
+#endif
     maxheight = menu_max_height();
 
     /* First, determine the width of the longest menu entry */
@@ -1475,8 +1475,6 @@ curs_nonselect_menu_action(
             }
             menu_item_ptr = menu_item_ptr->next_item;
         }
-
-        menu_item_ptr = menu->entries;
         break;
     } /* case MENU_SEARCH */
     default:
@@ -1500,7 +1498,7 @@ menu_get_selections(WINDOW *win, nhmenu *menu, int how)
     int num_selected = 0;
     boolean dismiss = FALSE;
     char selectors[256], groupaccels[256];
-    nhmenu_item *menu_item_ptr = menu->entries;
+    nhmenu_item *menu_item_ptr;
 
     activemenu = win;
     menu_display_page(win, menu, curpage, selectors, groupaccels);
diff --git a/win/curses/cursmesg.c b/win/curses/cursmesg.c
diff --git a/win/curses/cursstat.c b/win/curses/cursstat.c
diff --git a/win/curses/curswins.c b/win/curses/curswins.c
diff --git a/win/share/tilemap.c b/win/share/tilemap.c
diff --git a/win/tty/wintty.c b/win/tty/wintty.c
