From e537ff7be6133bfccde0c8e2de74610d17c0e94f Mon Sep 17 00:00:00 2001 From: dkf Date: Tue, 20 Nov 2018 13:51:38 +0000 Subject: More coverity issues --- generic/tclEncoding.c | 9 +++++++-- generic/tclScan.c | 2 +- generic/tclTrace.c | 16 ++++------------ 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c index 6b440e7..51909c2 100644 --- a/generic/tclEncoding.c +++ b/generic/tclEncoding.c @@ -1720,7 +1720,9 @@ LoadTableEncoding( }; Tcl_DStringInit(&lineString); - Tcl_Gets(chan, &lineString); + if (Tcl_Gets(chan, &lineString) < 0) { + return NULL; + } line = Tcl_DStringValue(&lineString); fallback = (int) strtol(line, &line, 16); @@ -1760,8 +1762,11 @@ LoadTableEncoding( for (i = 0; i < numPages; i++) { int ch; const char *p; + int expected = 3 + 16 * (16 * 4 + 1); - Tcl_ReadChars(chan, objPtr, 3 + 16 * (16 * 4 + 1), 0); + if (Tcl_ReadChars(chan, objPtr, expected, 0) != expected) { + return NULL; + } p = Tcl_GetString(objPtr); hi = (staticHex[UCHAR(p[0])] << 4) + staticHex[UCHAR(p[1])]; dataPtr->toUnicode[hi] = pageMemPtr; diff --git a/generic/tclScan.c b/generic/tclScan.c index 7f71262..3dae3b3 100644 --- a/generic/tclScan.c +++ b/generic/tclScan.c @@ -134,7 +134,7 @@ BuildCharSet( * as well as the dash. */ - if (*format == ']') { + if (*format == ']' || !cset->ranges) { cset->chars[cset->nchars++] = start; cset->chars[cset->nchars++] = ch; } else { diff --git a/generic/tclTrace.c b/generic/tclTrace.c index d48761b..882dc39 100644 --- a/generic/tclTrace.c +++ b/generic/tclTrace.c @@ -537,9 +537,7 @@ TraceExecutionObjCmd( Tcl_DeleteTrace(interp, tcmdPtr->stepTrace); tcmdPtr->stepTrace = NULL; - if (tcmdPtr->startCmd != NULL) { - ckfree(tcmdPtr->startCmd); - } + ckfree(tcmdPtr->startCmd); } if (tcmdPtr->flags & TCL_TRACE_EXEC_IN_PROGRESS) { /* @@ -1349,9 +1347,7 @@ TraceCommandProc( if (tcmdPtr->stepTrace != NULL) { Tcl_DeleteTrace(interp, tcmdPtr->stepTrace); tcmdPtr->stepTrace = NULL; - if (tcmdPtr->startCmd != NULL) { - ckfree(tcmdPtr->startCmd); - } + ckfree(tcmdPtr->startCmd); } if (tcmdPtr->flags & TCL_TRACE_EXEC_IN_PROGRESS) { /* @@ -1814,9 +1810,7 @@ TraceExecutionProc( && (strcmp(command, tcmdPtr->startCmd) == 0)) { Tcl_DeleteTrace(interp, tcmdPtr->stepTrace); tcmdPtr->stepTrace = NULL; - if (tcmdPtr->startCmd != NULL) { - ckfree(tcmdPtr->startCmd); - } + ckfree(tcmdPtr->startCmd); } /* @@ -1941,9 +1935,7 @@ TraceExecutionProc( if (tcmdPtr->stepTrace != NULL) { Tcl_DeleteTrace(interp, tcmdPtr->stepTrace); tcmdPtr->stepTrace = NULL; - if (tcmdPtr->startCmd != NULL) { - ckfree(tcmdPtr->startCmd); - } + ckfree(tcmdPtr->startCmd); } } if (call) { -- cgit v0.12 From 3c7c613ec1163e0f1c2d1c2db69382b34a467473 Mon Sep 17 00:00:00 2001 From: hypnotoad Date: Wed, 21 Nov 2018 13:06:52 +0000 Subject: Added a wrapper script for native builds to utilize Tcl to generate a VFS to attach to executables or dynamic libraries --- tools/installVfs.tcl | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 tools/installVfs.tcl diff --git a/tools/installVfs.tcl b/tools/installVfs.tcl new file mode 100644 index 0000000..ad1f5c7 --- /dev/null +++ b/tools/installVfs.tcl @@ -0,0 +1,54 @@ +#!/bin/sh +#\ +exec tclsh "$0" ${1+"$@"} + +#---------------------------------------------------------------------- +# +# installVfs.tcl -- +# +# This file wraps the /library file system around a binary +# +#---------------------------------------------------------------------- +# +# Copyright (c) 2018 by Sean Woods. All rights reserved. +# See the file "license.terms" for information on usage and redistribution +# of this file, and for a DISCLAIMER OF ALL WARRANTIES. +#---------------------------------------------------------------------- + +proc mapDir {resultvar prefix filepath} { + upvar 1 $resultvar result + if {![info exists result]} { + set result {} + } + set queue [list $prefix $filepath] + while {[llength $queue]} { + set queue [lassign $queue qprefix qpath] + foreach ftail [glob -directory $qpath -nocomplain -tails *] { + set f [file join $qpath $ftail] + if {[file isdirectory $f]} { + if {$ftail eq "CVS"} continue + lappend queue [file join $qprefix $ftail] $f + } elseif {[file isfile $f]} { + if {$ftail eq "pkgIndex.tcl"} continue + if {$ftail eq "manifest.txt"} { + lappend result $f [file join $qprefix pkgIndex.tcl] + } else { + lappend result $f [file join $qprefix $ftail] + } + } + } + } +} +if {[llength $argv]<4} { + error "Usage: [file tail [info script]] IMG_OUTPUT IMG_INPUT PREFIX FILE_SYSTEM ?PREFIX FILE_SYSTEM?..." +} + +set paths [lassign $argv DLL_OUTPUT DLL_INPUT] +foreach {prefix fpath} $paths { + mapDir files $prefix [file normalize $fpath] +} +if {$DLL_INPUT != {}} { + zipfs lmkzip $DLL_OUTPUT $files +} else { + zipfs lmkimg $DLL_OUTPUT $files {} $DLL_INPUT +} -- cgit v0.12 From f49b4015121c06d999d6a370fe355c626eec0deb Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Thu, 22 Nov 2018 07:40:12 +0000 Subject: typo, which caused travis build to fail. --- win/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win/Makefile.in b/win/Makefile.in index fa9f4a7..8da7058 100644 --- a/win/Makefile.in +++ b/win/Makefile.in @@ -487,7 +487,7 @@ ${TCL_ZIP_FILE}: ${ZIP_INSTALL_OBJS} ${DDE_DLL_FILE} ${REG_DLL_FILE} rm -rf ${TCL_VFS_ROOT} mkdir -p ${TCL_VFS_PATH} $(COPY) -a $(TOP_DIR)/library/* ${TCL_VFS_PATH} - $(COPY) -a ${TCL_VFS_PATH}/manfest.txt ${TCL_VFS_PATH}/pkgIndex.tcl + $(COPY) -a ${TCL_VFS_PATH}/manifest.txt ${TCL_VFS_PATH}/pkgIndex.tcl $(COPY) ${DDE_DLL_FILE} ${TCL_VFS_PATH}/dde $(COPY) ${REG_DLL_FILE} ${TCL_VFS_PATH}/reg cd ${TCL_VFS_ROOT} ; ${NATIVE_ZIP} ${ZIP_PROG_OPTIONS} ../${TCL_ZIP_FILE} ${ZIP_PROG_VFSSEARCH} -- cgit v0.12