X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;ds=sidebyside;f=base%2Fidtable.c;h=6e7aafaa1562c94b8f16398acc4a6acfb42622cc;hb=HEAD;hp=2d73e3d16d42667d26d98df46f3e35005cd8fc3a;hpb=3340221c68f8c948db9d2d3b553692fe642dd0f8;p=chiark-tcl.git
diff --git a/base/idtable.c b/base/idtable.c
index 2d73e3d..6e7aafa 100644
--- a/base/idtable.c
+++ b/base/idtable.c
@@ -1,8 +1,22 @@
/*
+ * base code for various Tcl extensions
+ * Copyright 2006-2012 Ian Jackson
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this library; if not, see .
*/
-#include "chiark-tcl.h"
-#include "tables.h"
+#include "chiark-tcl-base.h"
/* Arg parsing */
@@ -63,14 +77,12 @@ int cht_tabledataid_parse(Tcl_Interp *ip, Tcl_Obj *o, const IdDataSpec *idds) {
int l;
unsigned long ul;
IdDataValue *dv;
- IdDataAssocData *assoc;
char *ep, *str;
if (o->typePtr != &cht_tabledataid_nearlytype) goto convert;
dv= o->internalRep.otherValuePtr;
if (dv->interp != ip) goto convert;
- assoc= dv->assoc;
if (dv->assoc->idds != idds) goto convert;
return TCL_OK;
@@ -131,6 +143,7 @@ Tcl_Obj *cht_ret_iddata(Tcl_Interp *ip, void *val, const IdDataSpec *idds) {
if (ix==-1) {
for (ix=0; ixn && assoc->a[ix]; ix++);
if (ix>=assoc->n) {
+ assert(assoc->n < INT_MAX/4);
assoc->n += 2;
assoc->n *= 2;
assoc->a= TREALLOC(assoc->a, assoc->n*sizeof(*assoc->a));