Prevent under/over flow of float8 constants in parser. Small regression fix.

bmomjian · bmomjian · commit 6eb05251854b · 1997-02-19T20:11:05.000Z
diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.9 1997/02/14 04:15:59 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.10 1997/02/19 20:10:38 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #endif /* __linux__ */
 #include <string.h>
+#include <errno.h>
 
 #include "postgres.h"
 #include "miscadmin.h"
@@ -30,6 +31,7 @@
 #include "parser/scansup.h"
 #include "parser/sysfunc.h"
 #include "parse.h"
+#include "utils/builtins.h"
 
 extern char *parseString;
 extern char *parseCh;
@@ -109,8 +111,13 @@ other		.
 			return (ICONST);
 		}
 {real}		{
-			yylval.dval = atof((char*)yytext);
-			return (FCONST);
+		char* endptr;
+		errno = 0;
+		yylval.dval = strtod(((char *)yytext),&endptr);
+		if (*endptr != '\0' || errno == ERANGE)
+		    elog(WARN,"\tBad float8 input format\n");
+		CheckFloat8Val(yylval.dval);
+		return (FCONST);
 		}
 {quote}	        {       
                         char literal[MAX_PARSE_BUFFER];
diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.11 1997/02/14 04:17:52 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.12 1997/02/19 20:10:49 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -127,7 +127,7 @@ static void CheckFloat4Val(double val)
    
    raise an elog warning if it is
 */
-static void CheckFloat8Val(double val)
+void CheckFloat8Val(double val)
 {
   /* defining unsafe floats's will make float4 and float8 ops faster
      at the cost of safety, of course! */
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: builtins.h,v 1.8 1996/11/16 04:59:10 momjian Exp $
+ * $Id: builtins.h,v 1.9 1997/02/19 20:11:05 momjian Exp $
  *
  * NOTES
  *    This should normally only be included by fmgr.h.
@@ -260,6 +260,7 @@ extern char *filename_in(char *file);
 extern char *filename_out(char *s);
 
 /* float.c */
+extern void CheckFloat8Val(double val);	/* used by lex */
 extern float32 float4in(char *num);
 extern char *float4out(float32 num);
 extern float64 float8in(char *num);

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.11 1997/02/14 04:17:52 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/adt/float.c,v 1.12 1997/02/19 20:10:49 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -127,7 +127,7 @@ static void CheckFloat4Val(double val)`
`127`	`127`
`128`	`128`	`raise an elog warning if it is`
`129`	`129`	`*/`
`130`		`-static void CheckFloat8Val(double val)`
	`130`	`+void CheckFloat8Val(double val)`
`131`	`131`	`{`
`132`	`132`	`/* defining unsafe floats's will make float4 and float8 ops faster`
`133`	`133`	`at the cost of safety, of course! */`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: builtins.h,v 1.8 1996/11/16 04:59:10 momjian Exp $`
	`9`	`+ * $Id: builtins.h,v 1.9 1997/02/19 20:11:05 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`* NOTES`
`12`	`12`	`* This should normally only be included by fmgr.h.`
`@@ -260,6 +260,7 @@ extern char filename_in(char file);`
`260`	`260`	`extern char filename_out(char s);`
`261`	`261`
`262`	`262`	`/* float.c */`
	`263`	`+extern void CheckFloat8Val(double val); /* used by lex */`
`263`	`264`	`extern float32 float4in(char *num);`
`264`	`265`	`extern char *float4out(float32 num);`
`265`	`266`	`extern float64 float8in(char *num);`