https://sources.debian.org/data/main/p/plib/1.8.5-8/debian/patches/05_CVE-2012-4552.diff diff -up plib-1.8.5/src/ssg/ssgParser.cxx~ plib-1.8.5/src/ssg/ssgParser.cxx --- plib-1.8.5/src/ssg/ssgParser.cxx~ 2008-03-11 03:06:23.000000000 +0100 +++ plib-1.8.5/src/ssg/ssgParser.cxx 2012-11-01 15:33:12.424483374 +0100 @@ -57,18 +57,16 @@ void _ssgParser::error( const char *form char msgbuff[ 255 ]; va_list argp; - char* msgptr = msgbuff; - if (linenum) - { - msgptr += sprintf ( msgptr,"%s, line %d: ", - path, linenum ); - } - va_start( argp, format ); - vsprintf( msgptr, format, argp ); + vsnprintf( msgbuff, sizeof(msgbuff), format, argp ); va_end( argp ); - ulSetError ( UL_WARNING, "%s", msgbuff ) ; + if (linenum) + { + ulSetError ( UL_WARNING, "%s, line %d: %s", path, linenum, msgbuff ) ; + } else { + ulSetError ( UL_WARNING, "%s", msgbuff ) ; + } } @@ -78,18 +76,16 @@ void _ssgParser::message( const char *fo char msgbuff[ 255 ]; va_list argp; - char* msgptr = msgbuff; - if (linenum) - { - msgptr += sprintf ( msgptr,"%s, line %d: ", - path, linenum ); - } - va_start( argp, format ); - vsprintf( msgptr, format, argp ); + vsnprintf( msgbuff, sizeof(msgbuff), format, argp ); va_end( argp ); - ulSetError ( UL_DEBUG, "%s", msgbuff ) ; + if (linenum) + { + ulSetError ( UL_DEBUG, "%s, line %d: %s", path, linenum, msgbuff ) ; + } else { + ulSetError ( UL_DEBUG, "%s", msgbuff ) ; + } } // Opens the file and does a few internal calculations based on the spec. ss='form'>
path: root/gnu/build/linux-initrd.scm
AgeCommit message (Expand)Author
2020-12-15store-copy: 'populate-store' can optionally deduplicate files....Until now deduplication was performed as an additional pass after copying files, which involve re-traversing all the files that had just been copied. * guix/store/deduplication.scm (copy-file/deduplicate): New procedure. * tests/store-deduplication.scm ("copy-file/deduplicate"): New test. * guix/build/store-copy.scm (populate-store): Add #:deduplicate? parameter and honor it. * tests/gexp.scm ("gexp->derivation, store copy"): Pass #:deduplicate? #f to 'populate-store'. * gnu/build/image.scm (initialize-root-partition): Pass #:deduplicate? to 'populate-store'. Pass #:deduplicate? #f to 'register-closure'. * gnu/build/vm.scm (root-partition-initializer): Likewise. * gnu/build/install.scm (populate-single-profile-directory): Pass #:deduplicate? #f to 'populate-store'. * gnu/build/linux-initrd.scm (build-initrd): Likewise. * guix/scripts/pack.scm (self-contained-tarball)[import-module?]: New procedure. [build]: Pass it as an argument to 'source-module-closure'. * guix/scripts/pack.scm (squashfs-image)[build]: Wrap in 'with-extensions'. * gnu/system/linux-initrd.scm (expression->initrd)[import-module?]: New procedure. [builder]: Pass it to 'source-module-closure'. * gnu/system/install.scm (cow-store-service-type)[import-module?]: New procedure. Pass it to 'source-module-closure'. Ludovic Courtès
2020-11-21linux-initrd: Remove unnecessary timestamp reset phase....* gnu/build/linux-initrd.scm (write-cpio-archive): Mention timestamps in docstring. (build-initrd): Remove unnecessary timestamp reset phase. Ludovic Courtès