From: Keith Packard <keithp@keithp.com>
Date: Sun, 7 Jan 2024 06:08:54 +0000 (-0800)
Subject: altos: Updating pyro format tried to copy entries with no value
X-Git-Tag: 1.9.18~2^2~97
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=14f1e175af85c0ef4539316d5ce049798a878fcb

altos: Updating pyro format tried to copy entries with no value

Need to check for NO_VALUE before attempting to copy data, otherwise
things will go badly.

Signed-off-by: Keith Packard <keithp@keithp.com>
---

diff --git a/src/kernel/ao_pyro.c b/src/kernel/ao_pyro.c
index c40c50df..4c69b82a 100644
--- a/src/kernel/ao_pyro.c
+++ b/src/kernel/ao_pyro.c
@@ -684,9 +684,11 @@ ao_pyro_update_version(void)
 
 			for (v = 0; v < NUM_PYRO_VALUES; v++)
 			{
-				value = ao_pyro_get_1_24(&pyro_1_24[p], ao_pyro_values[v].flag);
-				ao_pyro_put(&tmp, ao_pyro_values[v].offset,
-					    ao_pyro_size(ao_pyro_values[v].flag), value);
+				if (ao_pyro_values[v].offset != NO_VALUE) {
+					value = ao_pyro_get_1_24(&pyro_1_24[p], ao_pyro_values[v].flag);
+					ao_pyro_put(&tmp, ao_pyro_values[v].offset,
+						    ao_pyro_size(ao_pyro_values[v].flag), value);
+				}
 			}
 			memcpy(&pyro_1_25[p], &tmp, sizeof(tmp));
 		}