head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.128 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.126 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.2.0.124 pkgsrc-2025Q3-base:1.2 pkgsrc-2025Q2:1.2.0.122 pkgsrc-2025Q2-base:1.2 pkgsrc-2025Q1:1.2.0.120 pkgsrc-2025Q1-base:1.2 pkgsrc-2024Q4:1.2.0.118 pkgsrc-2024Q4-base:1.2 pkgsrc-2024Q3:1.2.0.116 pkgsrc-2024Q3-base:1.2 pkgsrc-2024Q2:1.2.0.114 pkgsrc-2024Q2-base:1.2 pkgsrc-2024Q1:1.2.0.112 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.110 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.108 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.106 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.104 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.102 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.100 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.98 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.96 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.94 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.92 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.90 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.88 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.86 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.84 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.80 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.60 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.82 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.78 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.76 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.74 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.72 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.70 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.68 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.66 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.64 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.62 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.58 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.56 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.54 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.52 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.50 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.48 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.46 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.44 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.42 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.40 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.38 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.36 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.34 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.32 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.30 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.28 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.26 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.24 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.22 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.20 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.18 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.16 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.14 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.12 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.10 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.8 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.6 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.4 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.2 pkgsrc-2010Q2-base:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.2 date 2010.04.28.07.32.41; author obache; state Exp; branches; next 1.1; 1.1 date 2010.04.25.12.46.19; author obache; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2010.04.25.12.46.19; author obache; state Exp; branches; next ; desc @@ 1.2 log @let to exec "gs" with absolute path as PR#43214. Bump PKGREVISION. @ text @$NetBSD: patch-ab,v 1.1.1.1 2010/04/25 12:46:19 obache Exp $ * Set absolute path for GS cmmand. * Fixes CVE-2005-2536 and SA20012 Debian's security patch (also used in FreeBSD). --- main.c.orig 2004-01-09 10:17:38.000000000 +0000 +++ main.c @@@@ -48,7 +48,7 @@@@ extern BUNDLE ocr, rot270, rot90; static BOOLEAN cork = FALSE; static BOOLEAN debug = FALSE; -static const char *gs_cmd = "gs"; +static const char *gs_cmd = "@@GS_CMD@@"; static const char *outfile = ""; static char *cmd; /* = argv[0] */ @@@@ -126,12 +126,14 @@@@ static char *cmdfile = NULL, *gsoutfile static int cleanup(void) { int gsstatus, status = 0; pstotextExit(instance); - if (gs!=NULL) { #ifdef VMS + if (gs!=NULL) { gsstatus = fclose(gs); + } #else - gsstatus = pclose(gs); + waitpid(-1, &gsstatus, 0); #endif + if (gsstatus) { if (WIFEXITED(gsstatus)) { if (WEXITSTATUS(gsstatus)!=0) status = 3; else if (WIFSIGNALED(gsstatus)) status = 4; @@@@ -166,8 +168,13 @@@@ static void handler(int x) { static int do_it(char *path) { /* If "path" is NULL, then "stdin" should be processed. */ - char *gs_cmdline; - char *input; + char *gs_argv[32]; + int gs_argc=0; +#ifdef DEBUG + int i; +#endif + int fd[2]; + pid_t p; int status; char norotate[] = ""; FILE *fileout; @@@@ -201,47 +208,31 @@@@ static int do_it(char *path) { exit(1); } - if (path==NULL) { - input = (char*)malloc(2); - if (input == NULL) { - fprintf(stderr,"No memory available\n"); - cleanup(); - exit(1); + gs_argv[gs_argc++] = "gs"; + gs_argv[gs_argc++] = "-r72"; + gs_argv[gs_argc++] = "-dNODISPLAY"; + gs_argv[gs_argc++] = "-dFIXEDMEDIA"; + gs_argv[gs_argc++] = "-dDELAYBIND"; + gs_argv[gs_argc++] = "-dWRITESYSTEMDICT"; + if (!debug) { + gs_argv[gs_argc++] = "-q"; + } + gs_argv[gs_argc++] = "-dNOPAUSE"; + gs_argv[gs_argc++] = "-dSAFER"; + if (rotate_path && strcmp(rotate_path, "")) { + gs_argv[gs_argc++] = rotate_path; } - strcpy(input, "-"); - } else { - input = (char*)malloc(strlen(path) + 6); - if (input == NULL) { - fprintf(stderr,"No memory available\n"); - cleanup(); - exit(1); + if (ocr_path && strcmp(ocr_path, "")) { + gs_argv[gs_argc++] = ocr_path; } - strcpy(input, "-- '"); strcat(input, path); strcat(input, "'"); + if (path == NULL ) { + gs_argv[gs_argc++] = "-"; } - - gs_cmdline = (char*)malloc(strlen(gs_cmd)+strlen(rotate_path)+ - strlen(ocr_path) + strlen(input) + 128); - - if (gs_cmdline == NULL) { - fprintf(stderr, "No memory available\n"); - cleanup(); - exit(1); + else { + gs_argv[gs_argc++] = "--"; + gs_argv[gs_argc++] = path; } - - sprintf( - gs_cmdline, -#ifdef VMS - "%s -r72 \"-dNODISPLAY\" \"-dFIXEDMEDIA\" \"-dDELAYBIND\" \"-dWRITESYSTEMDICT\" %s \"-dNOPAUSE\" %s %s %s", -#else - "%s -r72 -dNODISPLAY -dFIXEDMEDIA -dDELAYBIND -dWRITESYSTEMDICT %s -dNOPAUSE %s %s %s", -#endif - gs_cmd, - (debug ? "" : "-q"), - rotate_path, - ocr_path, - input - ); - if (debug) fprintf(stderr, "%s\n", gs_cmdline); + gs_argv[gs_argc++] = NULL; #ifdef VMS cmdfile = tempnam("SYS$SCRATCH:","PS2TGS"); gsoutfile = tempnam("SYS$SCRATCH:","GSRES"); @@@@ -259,8 +250,25 @@@@ static int do_it(char *path) { exit(1); } #else - gs = popen(gs_cmdline, "r"); - if (gs==0) {perror(cmd); exit(1);} + if (pipe(fd)) { + perror("pipe failed: "); exit(1); + }; + p = fork(); + if (p == -1) { + perror("fork failed: "); exit(1); + } + if (p == 0) { /* child */ + close(fd[0]); + dup2(fd[1], 1); /* Redirect stdout into pipe to parent */ + execvp(gs_cmd, gs_argv); + perror("execvp: "); status=cleanup(); exit(1); + } else { /* parent */ + close(fd[1]); + gs = fdopen(fd[0], "r"); + if (gs == NULL) { + perror("fdopen: "); status=cleanup(); exit(1); + } + } #endif status = pstotextInit(&instance); if (status!=0) { @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d136 1 a136 1 + execvp("gs", gs_argv); @ 1.1.1.1 log @Import pstotext-1.9 as converters/pstotext. Packaged by Stefan Schaeckeler in pkgsrc-wip. Pstotext extracts plain-text from postscript files (and somewhat less reliable from pdf files). @ text @@