diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2018-11-20 13:51:38 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2018-11-20 13:51:38 (GMT) |
| commit | e537ff7be6133bfccde0c8e2de74610d17c0e94f (patch) | |
| tree | def0e2b014d54ded341761c3aff22c92b57ea93c | |
| parent | 35299947e3250ea5b40f66bf8ee1c78844a9b553 (diff) | |
| download | tcl-e537ff7be6133bfccde0c8e2de74610d17c0e94f.zip tcl-e537ff7be6133bfccde0c8e2de74610d17c0e94f.tar.gz tcl-e537ff7be6133bfccde0c8e2de74610d17c0e94f.tar.bz2 | |
More coverity issues
| -rw-r--r-- | generic/tclEncoding.c | 9 | ||||
| -rw-r--r-- | generic/tclScan.c | 2 | ||||
| -rw-r--r-- | 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) { |