]> git.ipfire.org Git - thirdparty/postgresql.git/commitdiff
Tighten up overflow check in path_recv, pursuant to code review inspired
authorTom Lane <tgl@sss.pgh.pa.us>
Wed, 12 May 2004 22:39:00 +0000 (22:39 +0000)
committerTom Lane <tgl@sss.pgh.pa.us>
Wed, 12 May 2004 22:39:00 +0000 (22:39 +0000)
by Ken Ashcraft's report.  I think there is no actual bug here since if
the int32 value does wrap a little bit, palloc will still reject it.
Still it's better that the code be obviously correct.

src/backend/utils/adt/geo_ops.c

index 0e80190958d86084d99727448924bd1133a9b9c1..19de68af870925671b80c40a5849a9c9df08d1ad 100644 (file)
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *       $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.82 2003/09/29 00:05:25 petere Exp $
+ *       $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.82.2.1 2004/05/12 22:39:00 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1383,7 +1383,7 @@ path_recv(PG_FUNCTION_ARGS)
 
        closed = pq_getmsgbyte(buf);
        npts = pq_getmsgint(buf, sizeof(int32));
-       if (npts < 0 || npts >= (int32) (INT_MAX / sizeof(Point)))
+       if (npts < 0 || npts >= (int32) ((INT_MAX - offsetof(PATH, p[0])) / sizeof(Point)))
                ereport(ERROR,
                                (errcode(ERRCODE_INVALID_BINARY_REPRESENTATION),
                                 errmsg("invalid number of points in external \"path\" value")));