X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/ba8b854c88c822a8e0db25c33bc8625120889492..67ac03c93a1ad6aa969887bfa380ca29dc6b510f:/buffer.c

diff --git a/buffer.c b/buffer.c
index 6569516..b15a245 100644
--- a/buffer.c
+++ b/buffer.c
@@ -53,7 +53,7 @@ static PyObject *buferr;
 static PyObject *rbuf_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
 {
   char *p, *q;
-  int n;
+  Py_ssize_t n;
   buf_pyobj *me = 0;
   static char *kwlist[] = { "data", 0 };
 
@@ -112,7 +112,8 @@ end:
     uint##n x;								\
     if (!PyArg_ParseTuple(arg, ":getu" #w)) goto end;			\
     if (buf_getu##w(BUF_B(me), &x)) BUFERR();				\
-    return (getulong(x));						\
+    if (MASK##W <= ULONG_MAX) return (getulong(x));			\
+    else { kludge64 y; ASSIGN64(y, x); return (getk64(y)); }		\
   end:									\
     return (0);								\
   }
@@ -261,14 +262,14 @@ static PyMethodDef rbuf_pymethods[] = {
     METH(getu##w, "RBUF.getu" #w "() -> INT")
   DOUINTCONV(RBMETH_DECL_GETU_)
 #define RBMETH_DECL_GETBLK_(n, W, w)					\
-    METH(getblk##w, "RBUF.getblk" #w "() -> INT")
+    METH(getblk##w, "RBUF.getblk" #w "() -> BYTES")
   BUF_DOSUFFIXES(RBMETH_DECL_GETBLK_)
 #define RBMETH_DECL_GETBUF_(n, W, w)					\
-    METH(getbuf##w, "RBUF.getbuf" #w "() -> INT")
+    METH(getbuf##w, "RBUF.getbuf" #w "() -> RBUF'")
   BUF_DOSUFFIXES(RBMETH_DECL_GETBUF_)
   METH	(getmp,			"RBUF.getmp() -> X")
   METH	(getgf,			"RBUF.getgf() -> X")
-  KWMETH(getecpt,		"RBUF.getecpt(curve = None) -> P")
+  KWMETH(getecpt,		"RBUF.getecpt([curve = None]) -> P")
   METH	(getecptraw,		"RBUF.getecptraw(CURVE) -> P")
   METH	(getge,			"RBUF.getge(GROUP) -> X")
   METH	(getgeraw,		"RBUF.getgeraw(GROUP) -> X")
@@ -387,10 +388,10 @@ static PyObject *wbmeth_zero(PyObject *me, PyObject *arg)
 static PyObject *wbmeth_put(PyObject *me, PyObject *arg)
 {
   void *p;
-  int n;
+  Py_ssize_t n;
   if (!PyArg_ParseTuple(arg, "s#:put", &p, &n)) return (0);
   ensure(me, n);
-  buf_put(BUF_B(me), p, n); assert(BOK(BUF_B(m)));
+  buf_put(BUF_B(me), p, n); assert(BOK(BUF_B(me)));
   RETURN_ME;
 }
 
@@ -405,16 +406,20 @@ static PyObject *wbmeth_put(PyObject *me, PyObject *arg)
   }
 DOUINTCONV(WBMETH_PUTU_)
 
+#define MASKz 0
 #define SZ_z 1
 #define WBMETH_PUTBLK_(n, W, w)						\
   static PyObject *wbmeth_putblk##w(PyObject *me, PyObject *arg)	\
   {									\
     char *p;								\
-    int sz;								\
-    if (!PyArg_ParseTuple(arg, "s#:putblk" #w, &p, &sz)) return (0);	\
+    Py_ssize_t sz;							\
+    if (!PyArg_ParseTuple(arg, "s#:putblk" #w, &p, &sz)) goto end;	\
+    if (MASK##W && sz > MASK##W) VALERR("too large");			\
     ensure(me, sz + SZ_##n);						\
     buf_putmem##w(BUF_B(me), p, sz); assert(BOK(BUF_B(me)));		\
     RETURN_ME;								\
+  end:									\
+    return (0);								\
   }
 BUF_DOSUFFIXES(WBMETH_PUTBLK_)
 
@@ -501,7 +506,7 @@ static PyMethodDef wbuf_pymethods[] = {
   BUF_DOSUFFIXES(WBMETH_DECL_PUTBLK_)
   METH	(putmp,			"WBUF.putmp(X)")
   METH	(putgf,			"WBUF.putgf(X)")
-  KWMETH(putecpt,		"WBUF.putecpt(P)")
+  METH	(putecpt,		"WBUF.putecpt(P)")
   METH	(putecptraw,		"WBUF.putecptraw(P)")
   METH	(putge,			"WBUF.putge(X)")
   METH	(putgeraw,		"WBUF.putgeraw(X)")