projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added a few type casts to avoid warnings.
[yaz-moved-to-github.git]
/
src
/
ber_oid.c
diff --git
a/src/ber_oid.c
b/src/ber_oid.c
index
11da7c3
..
dc72163
100644
(file)
--- a/
src/ber_oid.c
+++ b/
src/ber_oid.c
@@
-1,8
+1,6
@@
-/*
- * Copyright (C) 1995-2005, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: ber_oid.c,v 1.5 2005-01-15 19:47:11 adam Exp $
*/
/**
*/
/**
@@
-18,7
+16,7
@@
#include "odr-priv.h"
#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;
{
int len, lenp, end;
int pos, n, res, id;
@@
-32,7
+30,7
@@
int ber_oidc(ODR o, Odr_oid *p)
odr_seterror(o, OPROTO, 18);
return 0;
}
odr_seterror(o, OPROTO, 18);
return 0;
}
- if (len <= 0)
+ if (len < 0)
{
odr_seterror(o, OPROTO, 19);
return 0;
{
odr_seterror(o, OPROTO, 19);
return 0;
@@
-44,8
+42,8
@@
int ber_oidc(ODR o, Odr_oid *p)
return 0;
}
pos = 0;
return 0;
}
pos = 0;
- while (len)
- {
+ while (len)
+ {
int id = 0;
do
{
int id = 0;
do
{
@@
-59,17
+57,33
@@
int ber_oidc(ODR o, Odr_oid *p)
len--;
}
while (*(o->bp++) & 0X80);
len--;
}
while (*(o->bp++) & 0X80);
+
+ if (id < 0)
+ {
+ odr_seterror(o, ODATA, 23);
+ return 0;
+ }
if (pos > 0)
p[pos++] = id;
if (pos > 0)
p[pos++] = id;
- else
+ else
{
p[0] = id / 40;
{
p[0] = id / 40;
- if (p[0] > 2)
+ if (p[0] > 2)
p[0] = 2;
p[0] = 2;
- p[1] = id - p[0] * 40;
- pos = 2;
+ p[1] = id - p[0] * 40;
+ pos = 2;
+ }
+ if (pos >= max_oid_size)
+ {
+ odr_seterror(o, OPROTO, 55);
+ return 0;
}
}
- }
+ }
+ if (pos < 2 || p[0] < 0 || p[1] < 0)
+ {
+ odr_seterror(o, ODATA, 23);
+ return 0;
+ }
p[pos] = -1;
return 1;
case ODR_ENCODE:
p[pos] = -1;
return 1;
case ODR_ENCODE:
@@
-83,12
+97,12
@@
int ber_oidc(ODR o, Odr_oid *p)
odr_seterror(o, ODATA, 23);
return 0;
}
odr_seterror(o, ODATA, 23);
return 0;
}
- for (pos = 1; p[pos] >= 0; pos++)
+ for (pos = 1; p[pos] != -1; pos++)
{
n = 0;
if (pos == 1)
id = p[0]*40 + p[1];
{
n = 0;
if (pos == 1)
id = p[0]*40 + p[1];
- else
+ else
id = p[pos];
do
{
id = p[pos];
do
{
@@
-119,3
+133,11
@@
int ber_oidc(ODR o, Odr_oid *p)
return 0;
}
}
return 0;
}
}
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+