mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Bruce Momjian 1997-02-19 20:11:05 +00:00
parent 5b5bbdb161
commit 6eb0525185
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/backend/parser/scan.l
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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> #include <stdlib.h>
#endif /* __linux__ */ #endif /* __linux__ */
#include <string.h> #include <string.h>
#include <errno.h>
#include "postgres.h" #include "postgres.h"
#include "miscadmin.h" #include "miscadmin.h"
@ -30,6 +31,7 @@
#include "parser/scansup.h" #include "parser/scansup.h"
#include "parser/sysfunc.h" #include "parser/sysfunc.h"
#include "parse.h" #include "parse.h"
#include "utils/builtins.h"
extern char *parseString; extern char *parseString;
extern char *parseCh; extern char *parseCh;
@ -109,8 +111,13 @@ other .
return (ICONST); return (ICONST);
} }
{real} { {real} {
yylval.dval = atof((char*)yytext); char* endptr;
return (FCONST); 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} { {quote} {
char literal[MAX_PARSE_BUFFER]; char literal[MAX_PARSE_BUFFER];

4
src/backend/utils/adt/float.c
View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * 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 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 /* defining unsafe floats's will make float4 and float8 ops faster
at the cost of safety, of course! */ at the cost of safety, of course! */

3
src/include/utils/builtins.h
View File

@ -6,7 +6,7 @@
* *
* Copyright (c) 1994, Regents of the University of California * 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 * NOTES
* This should normally only be included by fmgr.h. * 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); extern char *filename_out(char *s);
/* float.c */ /* float.c */
extern void CheckFloat8Val(double val); /* used by lex */
extern float32 float4in(char *num); extern float32 float4in(char *num);
extern char *float4out(float32 num); extern char *float4out(float32 num);
extern float64 float8in(char *num); extern float64 float8in(char *num);