to_char(): prevent accesses beyond the allocated buffer

bmomjian · bmomjian · commit 037529a11c96 · 2015-02-02T10:00:51.000-05:00
Previously very long field masks for floats could access memory beyond the existing buffer allocated to hold the result. Reported by Andres Freund and Peter Geoghegan. Backpatch to all supported versions. Security: CVE-2015-0241
diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c
@@ -4390,7 +4390,9 @@ NUM_numpart_to_char(NUMProc *Np, int id)
 					Np->num_in = TRUE;
 				}
 			}
-			++Np->number_p;
+			/* do no exceed string length */
+			if (*Np->number_p)
+				++Np->number_p;
 		}
 
 		end = Np->num_count + (Np->out_pre_spaces ? 1 : 0) + (IS_DECIMAL(Np->Num) ? 1 : 0);

Original file line number	Diff line number	Diff line change
`@@ -4390,7 +4390,9 @@ NUM_numpart_to_char(NUMProc *Np, int id)`
`4390`	`4390`	`Np->num_in = TRUE;`
`4391`	`4391`	`}`
`4392`	`4392`	`}`
`4393`		`- ++Np->number_p;`
	`4393`	`+ /* do no exceed string length */`
	`4394`	`+ if (*Np->number_p)`
	`4395`	`+ ++Np->number_p;`
`4394`	`4396`	`}`
`4395`	`4397`
`4396`	`4398`	`end = Np->num_count + (Np->out_pre_spaces ? 1 : 0) + (IS_DECIMAL(Np->Num) ? 1 : 0);`