1 files changed, 96 insertions, 5 deletions

diff --git a/lib/erl_interface/test/ei_decode_encode_SUITE_data/ei_decode_encode_test.c b/lib/erl_interface/test/ei_decode_encode_SUITE_data/ei_decode_encode_test.c
index 55d9ed1b1a..512f9ed0c7 100644
--- a/lib/erl_interface/test/ei_decode_encode_SUITE_data/ei_decode_encode_test.c
+++ b/lib/erl_interface/test/ei_decode_encode_SUITE_data/ei_decode_encode_test.c
@@ -40,6 +40,13 @@ typedef struct
     erlang_char_encoding enc;
 }my_atom;
 
+typedef struct
+{
+    const char* bytes;
+    unsigned int bitoffs;
+    size_t nbits;
+}my_bitstring;
+
 struct my_obj {
     union {
 	erlang_fun fun;
@@ -49,6 +56,7 @@ struct my_obj {
 	erlang_trace trace;
 	erlang_big big;
 	my_atom atom;
+        my_bitstring bits;
 
 	int arity;
     }u;
@@ -119,6 +127,26 @@ struct Type my_atom_type = {
     (encodeFT*)ei_encode_my_atom, (x_encodeFT*)ei_x_encode_my_atom
 };
 
+int ei_decode_my_bits(const char *buf, int *index, my_bitstring* a)
+{
+    return ei_decode_bitstring(buf, index, (a ? &a->bytes : NULL),
+                               (a ? &a->bitoffs : NULL),
+                               (a ? &a->nbits : NULL));
+}
+int ei_encode_my_bits(char *buf, int *index, my_bitstring* a)
+{
+    return ei_encode_bitstring(buf, index, a->bytes, a->bitoffs, a->nbits);
+}
+int ei_x_encode_my_bits(ei_x_buff* x, my_bitstring* a)
+{
+    return ei_x_encode_bitstring(x, a->bytes, a->bitoffs, a->nbits);
+}
+
+struct Type my_bitstring_type = {
+    "bits", "my_bitstring", (decodeFT*)ei_decode_my_bits,
+    (encodeFT*)ei_encode_my_bits, (x_encodeFT*)ei_x_encode_my_bits
+};
+
 
 int my_decode_tuple_header(const char *buf, int *index, struct my_obj* obj)
 {
@@ -237,11 +265,7 @@ void decode_encode(struct Type** tv, int nobj)
 	size1 = 0;
 	err = t->ei_decode_fp(inp, &size1, NULL);
 	if (err != 0) {
-	    if (err != -1) {
-		fail("decode returned non zero but not -1");
-	    } else {
-		fail1("decode '%s' returned non zero", t->name);
-	    }
+            fail2("decode '%s' returned non zero %d", t->name, err);
 	    return;
 	}
 	if (size1 < 1) {
@@ -470,6 +494,66 @@ void decode_encode_big(struct Type* t)
 }
 
 
+void encode_bitstring(void)
+{
+    char* packet;
+    char* inp;
+    char out_buf[BUFSZ];
+    int size;
+    int err, i;
+    ei_x_buff arg;
+    const char* p;
+    unsigned int bitoffs;
+    size_t nbits, org_nbits;
+
+    packet = read_packet(NULL);
+    inp = packet+1;
+
+    size = 0;
+    err = ei_decode_bitstring(inp, &size, &p, &bitoffs, &nbits);
+    if (err != 0) {
+        fail1("ei_decode_bitstring returned non zero %d", err);
+        return;
+    }
+
+    /*
+     * Now send a bunch of different sub-bitstrings back
+     * encoded both with ei_encode_ and ei_x_encode_.
+     */
+    org_nbits = nbits;
+    do {
+        size = 0;
+        err = ei_encode_bitstring(out_buf, &size, p, bitoffs, nbits);
+        if (err != 0) {
+            fail1("ei_encode_bitstring returned non zero %d", err);
+            return;
+        }
+
+        ei_x_new(&arg);
+        err = ei_x_encode_bitstring(&arg, p, bitoffs, nbits);
+        if (err != 0) {
+            fail1("ei_x_encode_bitstring returned non zero %d", err);
+            ei_x_free(&arg);
+            return;
+        }
+
+        if (arg.index < 1) {
+            fail("size is < 1");
+            ei_x_free(&arg);
+            return;
+        }
+
+        send_buffer(out_buf, size);
+        send_buffer(arg.buff, arg.index);
+        ei_x_free(&arg);
+
+        bitoffs++;
+        nbits -= (nbits / 20) + 1;
+    } while (nbits < org_nbits);
+
+    free_packet(packet);
+}
+
 
 /* ******************************************************************** */
 
@@ -480,6 +564,7 @@ TESTCASE(test_ei_decode_encode)
     ei_init();
 
     decode_encode_one(&fun_type);
+    decode_encode_one(&fun_type);
     decode_encode_one(&pid_type);
     decode_encode_one(&port_type);
     decode_encode_one(&ref_type);
@@ -537,6 +622,12 @@ TESTCASE(test_ei_decode_encode)
 	decode_encode(map, 7);
     }
 
+    for (i=0; i <= 48; i++) {
+        decode_encode_one(&my_bitstring_type);
+    }
+
+    encode_bitstring();
+
     report(1);
 }