Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitcbd3b97

Browse files
committed
Remove unnecessary pfree's in geometric operators. At least one of these
is actively dangerous, per bug report from Ewald Geschwinde 14-May-02,and several of the rest look suspicious to me. Since there is no longerany significant value in retail pfree's in these functions, just getrid of all of them for safety's sake.
1 parentcc2ce83 commitcbd3b97

File tree

1 file changed

+11
-42
lines changed

1 file changed

+11
-42
lines changed

‎src/backend/utils/adt/geo_ops.c‎

Lines changed: 11 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.60 2001/10/25 05:49:44 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/geo_ops.c,v 1.61 2002/05/14 18:16:51 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -1099,7 +1099,6 @@ line_distance(PG_FUNCTION_ARGS)
10991099
PG_RETURN_FLOAT8(fabs(l1->C-l2->C));
11001100
tmp=point_construct(0.0,l1->C);
11011101
result=dist_pl_internal(tmp,l2);
1102-
pfree(tmp);
11031102
PG_RETURN_FLOAT8(result);
11041103
}
11051104

@@ -1843,8 +1842,6 @@ lseg_intersect_internal(LSEG *l1, LSEG *l2)
18431842
retval= true;/* interpt on l1 and l2 */
18441843
else
18451844
retval= false;
1846-
if (interpt!=NULL)
1847-
pfree(interpt);
18481845
returnretval;
18491846
}
18501847

@@ -2061,10 +2058,7 @@ lseg_interpt(PG_FUNCTION_ARGS)
20612058
*/
20622059
if (!on_ps_internal(result,l1)||
20632060
!on_ps_internal(result,l2))
2064-
{
2065-
pfree(result);
20662061
PG_RETURN_NULL();
2067-
}
20682062

20692063
/*
20702064
* If there is an intersection, then check explicitly for matching
@@ -2152,10 +2146,10 @@ dist_ps_internal(Point *pt, LSEG *lseg)
21522146
ln->A,ln->B,ln->C,pt->x,pt->y,m);
21532147
#endif
21542148

2155-
/*
2156-
* Calculate distance to the line segment
2157-
*or to the endpoints of the segment.
2158-
*/
2149+
/*
2150+
* Calculate distance to the line segment
2151+
*or to the endpoints of the segment.
2152+
*/
21592153

21602154
/* intersection is on the line segment? */
21612155
if ((ip=interpt_sl(lseg,ln))!=NULL)
@@ -2165,7 +2159,6 @@ dist_ps_internal(Point *pt, LSEG *lseg)
21652159
printf("dist_ps- distance is %f to intersection point is (%f,%f)\n",
21662160
result,ip->x,ip->y);
21672161
#endif
2168-
pfree(ip);
21692162
}
21702163
else
21712164
{
@@ -2176,8 +2169,6 @@ dist_ps_internal(Point *pt, LSEG *lseg)
21762169
result=tmpdist;
21772170
}
21782171

2179-
pfree(ln);
2180-
21812172
returnresult;
21822173
}
21832174

@@ -2245,13 +2236,12 @@ dist_pb(PG_FUNCTION_ARGS)
22452236
Point*pt=PG_GETARG_POINT_P(0);
22462237
BOX*box=PG_GETARG_BOX_P(1);
22472238
float8result;
2248-
Point*tmp;
2239+
Point*near;
22492240

2250-
tmp=DatumGetPointP(DirectFunctionCall2(close_pb,
2251-
PointPGetDatum(pt),
2252-
BoxPGetDatum(box)));
2253-
result=point_dt(tmp,pt);
2254-
pfree(tmp);
2241+
near=DatumGetPointP(DirectFunctionCall2(close_pb,
2242+
PointPGetDatum(pt),
2243+
BoxPGetDatum(box)));
2244+
result=point_dt(near,pt);
22552245

22562246
PG_RETURN_FLOAT8(result);
22572247
}
@@ -2294,7 +2284,6 @@ dist_sb(PG_FUNCTION_ARGS)
22942284
result=DirectFunctionCall2(dist_pb,
22952285
PointPGetDatum(tmp),
22962286
BoxPGetDatum(box));
2297-
pfree(tmp);
22982287

22992288
PG_RETURN_DATUM(result);
23002289
}
@@ -2308,7 +2297,7 @@ dist_lb(PG_FUNCTION_ARGS)
23082297
BOX*box=PG_GETARG_BOX_P(1);
23092298
#endif
23102299

2311-
/* think about this one for a while */
2300+
/*need tothink about this one for a while */
23122301
elog(ERROR,"dist_lb not implemented");
23132302

23142303
PG_RETURN_NULL();
@@ -2401,7 +2390,6 @@ interpt_sl(LSEG *lseg, LINE *line)
24012390
}
24022391
else
24032392
{
2404-
pfree(p);
24052393
p=NULL;
24062394
}
24072395
}
@@ -2417,10 +2405,7 @@ has_interpt_sl(LSEG *lseg, LINE *line)
24172405

24182406
tmp=interpt_sl(lseg,line);
24192407
if (tmp)
2420-
{
2421-
pfree(tmp);
24222408
return true;
2423-
}
24242409
return false;
24252410
}
24262411

@@ -2624,22 +2609,17 @@ close_lseg(PG_FUNCTION_ARGS)
26242609
PointPGetDatum(&l2->p[0]),
26252610
LsegPGetDatum(l1)));
26262611
memcpy(&point,result,sizeof(Point));
2627-
pfree(result);
26282612
result=DatumGetPointP(DirectFunctionCall2(close_ps,
26292613
PointPGetDatum(&point),
26302614
LsegPGetDatum(l2)));
26312615
}
26322616

26332617
if ((d=dist_ps_internal(&l2->p[1],l1))<dist)
26342618
{
2635-
if (result!=NULL)
2636-
pfree(result);
2637-
26382619
result=DatumGetPointP(DirectFunctionCall2(close_ps,
26392620
PointPGetDatum(&l2->p[1]),
26402621
LsegPGetDatum(l1)));
26412622
memcpy(&point,result,sizeof(Point));
2642-
pfree(result);
26432623
result=DatumGetPointP(DirectFunctionCall2(close_ps,
26442624
PointPGetDatum(&point),
26452625
LsegPGetDatum(l2)));
@@ -3574,9 +3554,6 @@ box_mul(PG_FUNCTION_ARGS)
35743554

35753555
result=box_construct(high->x,low->x,high->y,low->y);
35763556

3577-
pfree(high);
3578-
pfree(low);
3579-
35803557
PG_RETURN_BOX_P(result);
35813558
}
35823559

@@ -3598,9 +3575,6 @@ box_div(PG_FUNCTION_ARGS)
35983575

35993576
result=box_construct(high->x,low->x,high->y,low->y);
36003577

3601-
pfree(high);
3602-
pfree(low);
3603-
36043578
PG_RETURN_BOX_P(result);
36053579
}
36063580

@@ -3700,7 +3674,6 @@ path_mul_pt(PG_FUNCTION_ARGS)
37003674
PointPGetDatum(point)));
37013675
path->p[i].x=p->x;
37023676
path->p[i].y=p->y;
3703-
pfree(p);
37043677
}
37053678

37063679
PG_RETURN_PATH_P(path);
@@ -3721,7 +3694,6 @@ path_div_pt(PG_FUNCTION_ARGS)
37213694
PointPGetDatum(point)));
37223695
path->p[i].x=p->x;
37233696
path->p[i].y=p->y;
3724-
pfree(p);
37253697
}
37263698

37273699
PG_RETURN_PATH_P(path);
@@ -3796,7 +3768,6 @@ poly_center(PG_FUNCTION_ARGS)
37963768
PolygonPGetDatum(poly)));
37973769
result=DirectFunctionCall1(circle_center,
37983770
CirclePGetDatum(circle));
3799-
pfree(circle);
38003771

38013772
PG_RETURN_DATUM(result);
38023773
}
@@ -4232,7 +4203,6 @@ circle_mul_pt(PG_FUNCTION_ARGS)
42324203
PointPGetDatum(point)));
42334204
result->center.x=p->x;
42344205
result->center.y=p->y;
4235-
pfree(p);
42364206
result->radius *=HYPOT(point->x,point->y);
42374207

42384208
PG_RETURN_CIRCLE_P(result);
@@ -4253,7 +4223,6 @@ circle_div_pt(PG_FUNCTION_ARGS)
42534223
PointPGetDatum(point)));
42544224
result->center.x=p->x;
42554225
result->center.y=p->y;
4256-
pfree(p);
42574226
result->radius /=HYPOT(point->x,point->y);
42584227

42594228
PG_RETURN_CIRCLE_P(result);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp