head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.116 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.114 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.112 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.110 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.108 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.106 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.104 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.102 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.100 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.98 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.96 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.94 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.92 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.90 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.88 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.86 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.84 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.82 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.80 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.78 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.76 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.74 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.72 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.68 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.48 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.70 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.66 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.64 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.62 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.60 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.58 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.56 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.54 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.52 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.50 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.46 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.44 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.42 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.40 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.38 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.36 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.34 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.32 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.30 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.28 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.26 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.24 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.22 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.20 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.18 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.16 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.14 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.12 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.10 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.8 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.6 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.4 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.2 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.2.0.46 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.44 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.42 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.40 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.38 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.36 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.34 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.32 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.30 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.28 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.26 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.24 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.22 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.20 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.18 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.16 pkgsrc-2008Q1:1.2.0.14 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.12 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.10 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.8 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.6 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.4 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.2 pkgsrc-2006Q3-base:1.2; locks; strict; comment @# @; 1.3 date 2011.11.24.13.44.35; author joerg; state Exp; branches; next 1.2; 1.2 date 2006.08.06.20.49.52; author mjl; state Exp; branches; next 1.1; 1.1 date 2006.08.01.12.50.23; author mjl; state Exp; branches; next ; desc @@ 1.3 log @GCC 4.5 fallout @ text @$NetBSD: patch-ae,v 1.2 2006/08/06 20:49:52 mjl Exp $ --- sserver.cpp.orig 2003-03-07 19:22:13.000000000 +0000 +++ sserver.cpp @@@@ -18,6 +18,7 @@@@ program: sserver version 0.03 by Axel Bu #include #include +#include #include #include #include @@@@ -52,7 +53,7 @@@@ int main(int argc, char * argv[]) char a_grabname[256]; char a_vpid[20]; char a_apid[20]; - char a_filename[256]; + char a_filename[PATH_MAX]; char a_path[256]=""; char a_host[256]; int i,n; @@@@ -169,10 +170,10 @@@@ int main(int argc, char * argv[]) sprintf(a_vpid,"0x%03x",recdata.vpid); sprintf(a_apid,"0x%03x",recdata.apid); - strcpy (a_filename,a_path); + strlcpy (a_filename,a_path, sizeof(a_filename)); if (strlen(a_filename)) { - strcat(a_filename,"/"); + strlcat(a_filename, "/", sizeof(a_filename)); } if (strlen(recdata.channelname) > 0) @@@@ -185,8 +186,8 @@@@ int main(int argc, char * argv[]) } } while (*p_act); - strcat(a_filename, recdata.channelname); - strcat(a_filename, "_"); + strlcat(a_filename, recdata.channelname, sizeof(a_filename)); + strlcat(a_filename, "_", sizeof(a_filename)); } if (strlen(recdata.epgtitle) > 0) @@@@ -206,13 +207,13 @@@@ int main(int argc, char * argv[]) } } while (*p_act++); - strcat(a_filename, recdata.epgtitle); - strcat(a_filename, "_"); + strlcat(a_filename, recdata.epgtitle, sizeof(a_filename)); + strlcat(a_filename, "_", sizeof(a_filename)); } t = time (&t); - strftime (buf, sizeof(a_filename)-1, "%Y%m%d_%H%M%S", localtime(&t)); - strcat(a_filename, buf); + strftime (buf, 20, "%Y%m%d_%H%M%S", localtime(&t)); + strlcat(a_filename, buf, sizeof(a_filename)); pid = fork(); if (pid == -1) { @ 1.2 log @Correct patch to actually do the right thing. @ text @d1 1 a1 1 $NetBSD$ d3 11 a13 3 --- sserver.cpp.orig 2003-03-07 20:22:13.000000000 +0100 +++ sserver.cpp 2006-08-06 22:45:30.000000000 +0200 @@@@ -52,7 +52,7 @@@@ d22 1 a22 1 @@@@ -169,10 +169,10 @@@@ d35 1 a35 1 @@@@ -185,8 +185,8 @@@@ d46 1 a46 1 @@@@ -206,13 +206,13 @@@@ @ 1.1 log @Add some patches hidden in the cvs repository but not included in the source tarball. Also add a patch to limit the constructed output file name to some saner length as well as increase the buffer to PATH_MAX. An overlong EPG data could easily overflow the buffer and crash the sserver process. @ text @d3 2 a4 2 --- sserver.cpp.orig 2006-08-01 13:48:11.000000000 +0200 +++ sserver.cpp 2006-08-01 13:54:45.000000000 +0200 d14 1 a14 1 @@@@ -169,7 +169,7 @@@@ d22 6 a27 2 strcat(a_filename,"/"); @@@@ -185,7 +185,7 @@@@ d32 3 a34 2 + strlcat(a_filename, recdata.channelname, 20); strcat(a_filename, "_"); d37 2 a38 1 @@@@ -206,7 +206,7 @@@@ d43 3 a45 2 + strlcat(a_filename, recdata.epgtitle, 80); strcat(a_filename, "_"); d48 8 @