nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Amiga: more review fixes

Browse Source 
- NHW_BASE / NHW_OVER collided with NHW_PERMINVENT=6; renumber off NHW_LAST_TYPE.
- GlyphToIcon used > 10000 instead of >=.
- make_menu_items sized array by sizeof(amii_menu_item) instead of menu_item.
- DoMenuScroll could deref NULL amip on SELECTUP.
- get_nhuuid uses ISAAC64 rn2() instead of hand-rolled LCG.
- fopenp's bound check fired one byte too late.
- winami.p had stale signatures for amii_end_menu, amii_select_menu, amii_suspend_nhwindows.
This commit is contained in:
Ingo Paschke
2026-05-11 20:29:47 +02:00
parent f8ea34489f
commit 22ddba7c1e
6 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/amiga/amidos.c
+5 -16
View File
@@ -47,30 +47,19 @@ amiga_self_assign(void)
UnLock(dup);
}
/* Generate an RFC 4122 v4 UUID for this game. Entropy comes from
DateStamp + the running task's address mixed through a small LCG. */
/* Generate an RFC 4122 v4 UUID for this game. Draw bytes from the
core's ISAAC64 RNG, which init_random() seeded before we get here. */
void
get_nhuuid(void)
{
uchar bytes[16];
struct DateStamp ds;
unsigned long x;
int i;
if (svn.nhuuid[0])
return;
DateStamp(&ds);
x = (unsigned long) ds.ds_Days
^ ((unsigned long) ds.ds_Minute << 16)
^ ((unsigned long) ds.ds_Tick << 8)
^ (unsigned long) FindTask(NULL);
/* Classic glibc/POSIX rand() LCG (Knuth, C99 7.22.2.1). Full period
2^32; we read bits 16-23 to skip the LCG's bad low bits. */
for (i = 0; i < 16; i++) {
x = x * 1103515245u + 12345u;
bytes[i] = (uchar) (x >> 16);
}
for (i = 0; i < 16; i++)
bytes[i] = (uchar) rn2(256);
/* RFC 4122: version=4 (random), variant=10. */
bytes[6] = (bytes[6] & 0x0F) | 0x40;
bytes[8] = (bytes[8] & 0x3F) | 0x80;
@@ -481,7 +470,7 @@ fopenp(const char *name, const char *mode)
while (pp && *pp) {
bp = buf;
while (*pp && *pp != PATHSEP) {
if (bp > buf + BUFSIZ - 1)
if (bp >= buf + BUFSIZ - 1)
return (NULL);
lastch = *bp++ = *pp++;
}