X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fber_oid.c;h=e1947d69dc67fe1408c2ab1a1ea2b20256b3efc1;hb=b853eb3de1a249859eef71c9a285172a199656ce;hp=11da7c308993130f978a167b0ea31c128a1467f4;hpb=4c176312acdc3444c9afc820f76a393e64668e52;p=yaz-moved-to-github.git diff --git a/src/ber_oid.c b/src/ber_oid.c index 11da7c3..e1947d6 100644 --- a/src/ber_oid.c +++ b/src/ber_oid.c @@ -2,7 +2,7 @@ * Copyright (C) 1995-2005, Index Data ApS * See the file LICENSE for details. * - * $Id: ber_oid.c,v 1.5 2005-01-15 19:47:11 adam Exp $ + * $Id: ber_oid.c,v 1.6 2005-05-26 21:46:40 adam Exp $ */ /** @@ -18,7 +18,7 @@ #include "odr-priv.h" -int ber_oidc(ODR o, Odr_oid *p) +int ber_oidc(ODR o, Odr_oid *p, int max_oid_size) { int len, lenp, end; int pos, n, res, id; @@ -32,7 +32,7 @@ int ber_oidc(ODR o, Odr_oid *p) odr_seterror(o, OPROTO, 18); return 0; } - if (len <= 0) + if (len < 0) { odr_seterror(o, OPROTO, 19); return 0; @@ -69,6 +69,11 @@ int ber_oidc(ODR o, Odr_oid *p) p[1] = id - p[0] * 40; pos = 2; } + if (pos >= max_oid_size) + { + odr_seterror(o, OPROTO, 55); + return 0; + } } p[pos] = -1; return 1;