On Sat, Aug 15, 2015 at 23:33:15 +0100, Michael Tautschnig wrote: > Package: xfig > Version: 1:3.2.5.c-4 > Usertags: goto-cc > Tags: patch > > During an analysis of all Debian packages using our research compiler > tool-chain > (using tools from the cbmc package) the following error was found: > > w_intersect.c defines do_circle_ellipse_intersect with 8 parameters; > circle_ellipse_intersect, however, passes only 7 arguments when invoking > do_circle_ellipse_intersect. > > The attached patch inserts this additional argument, assuming that it is ok > not > to pass an "arc" (do_circle_ellipse_intersect explicitly tests for arc being > set). >
It seems there are more issues of the same kind. The extended patch is attached. Best, Michael
diff -urN a/w_intersect.c b/w_intersect.c
--- a/w_intersect.c 2015-08-15 23:27:16.000000000 +0100
+++ b/w_intersect.c 2015-08-16 01:20:53.000000000 +0100
@@ -208,7 +208,7 @@
double X = (double)(c->center.x - e->center.x);
double Y = (double)(c->center.y - e->center.y);
- do_circle_ellipse_intersect(r, X, Y, e, x, y, isect_cb);
+ do_circle_ellipse_intersect(r, X, Y, e, x, y, NULL, isect_cb);
}
static void
@@ -1103,7 +1103,7 @@
double OX = (double)(e->center.x);
double OY = (double)(e->center.y);
- do_circle_circle(PX, PY, X2, Y2, R1, R2, OX, OY, a, isect_cb);
+ do_circle_circle(PX, PY, X2, Y2, R1, R2, OX, OY, a, NULL, isect_cb);
}
}
}
pgp6pQkdNyQc7.pgp
Description: PGP signature
