1.1 --- a/templates/native/buffer.c Mon Feb 27 11:57:15 2017 +0100
1.2 +++ b/templates/native/buffer.c Mon Feb 27 14:41:27 2017 +0100
1.3 @@ -37,7 +37,7 @@
1.4
1.5 /* Calculate the size of the string. */
1.6 for (i = 0; i < data->size; i++)
1.7 - size += __load_via_object(data->attrs[i].value, __ATTRPOS(__size__)).intvalue;
1.8 + size += __load_via_object(data->attrs[i].value, __size__).intvalue;
1.9
1.10 /* Reserve space for a new string. */
1.11 s = (char *) __ALLOCATE(size + 1, sizeof(char));
1.12 @@ -45,8 +45,8 @@
1.13 /* Build a single string from the buffer contents. */
1.14 for (i = 0, j = 0; i < data->size; i++)
1.15 {
1.16 - o = __load_via_object(data->attrs[i].value, __ATTRPOS(__data__));
1.17 - n = __load_via_object(data->attrs[i].value, __ATTRPOS(__size__)).intvalue;
1.18 + o = __load_via_object(data->attrs[i].value, __data__);
1.19 + n = __load_via_object(data->attrs[i].value, __size__).intvalue;
1.20 memcpy(s + j, o.strvalue, n); /* does not null terminate but final byte should be zero */
1.21 j += n;
1.22 }