nprintf() didn't fully respect the target width parameter when handli…

…ng % arguments
mywave82 · Oct 21, 2024 · 850aba7 · 850aba7
1 parent 71580bf
commit 850aba7
Showing 1 changed file with 32 additions and 0 deletions.
diff --git a/boot/console.c b/boot/console.c
@@ -368,6 +368,14 @@ static void display_nprintf (uint16_t y, uint16_t x, uint8_t color, uint16_t wid
 					{
 						requested_width = requested_precision;
 					}
+					if (requested_precision > width)
+					{
+						requested_precision = width;
+					}
+					if (requested_width > width)
+					{
+						requested_width = width;
+					}
 					if (requested_precision > requested_width)
 					{
 						requested_precision = requested_width;
@@ -408,6 +416,14 @@ static void display_nprintf (uint16_t y, uint16_t x, uint8_t color, uint16_t wid
 					{
 						requested_width = requested_precision;
 					}
+					if (requested_precision > width)
+					{
+						requested_precision = width;
+					}
+					if (requested_width > width)
+					{
+						requested_width = width;
+					}
 					if (requested_precision > requested_width)
 					{
 						requested_precision = requested_width;
@@ -508,6 +524,14 @@ static void display_nprintf (uint16_t y, uint16_t x, uint8_t color, uint16_t wid
 								{
 									requested_width = requested_precision;
 								}
+								if (requested_precision > width)
+								{
+									requested_precision = width;
+								}
+								if (requested_width > width)
+								{
+									requested_width = width;
+								}
 								if (requested_precision > requested_width)
 								{
 									requested_precision = requested_width;
@@ -582,6 +606,14 @@ static void display_nprintf (uint16_t y, uint16_t x, uint8_t color, uint16_t wid
 								{
 									requested_width = requested_precision;
 								}
+								if (requested_precision > width)
+								{
+									requested_precision = width;
+								}
+								if (requested_width > width)
+								{
+									requested_width = width;
+								}
 								if (requested_precision > requested_width)
 								{
 									requested_precision = requested_width;