5e0083a133
This fixes CVE-2018-16140 and CVE-2019-14275.
Since version 3.2.7a, the X bitmaps files are not installed anymore.
From upstream CHANGES:
o Distribute the X bitmaps files within fig2dev, no need to install
these files. The files were needed for Tk and Perl/Tk output.
OK rsadowski@
24 lines
745 B
Plaintext
24 lines
745 B
Plaintext
$OpenBSD: patch-fig2dev_fig2dev_c,v 1.2 2019/11/13 15:24:11 fcambus Exp $
|
|
|
|
Index: fig2dev/fig2dev.c
|
|
--- fig2dev/fig2dev.c.orig
|
|
+++ fig2dev/fig2dev.c
|
|
@@ -45,7 +45,7 @@
|
|
#include "read.h"
|
|
|
|
/* the three lines below could go into a getopt.h file */
|
|
-extern int fig_getopt(int nargc, char **nargv, char *ostr); /* getopt.c */
|
|
+#include <unistd.h>
|
|
extern char *optarg; /* getopt.c */
|
|
extern int optind; /* getopt.c */
|
|
|
|
@@ -219,7 +219,7 @@ get_args(int argc, char *argv[])
|
|
if (argc == 1)
|
|
fprintf(stderr, Usage, prog, prog);
|
|
/* sum of all arguments */
|
|
- while ((c = fig_getopt(argc, argv, ARGSTRING)) != EOF) {
|
|
+ while ((c = getopt(argc, argv, ARGSTRING)) != EOF) {
|
|
|
|
/* global (all drivers) option handling */
|
|
switch (c) {
|