memset(rpc, 0, sizeof(struct rpc_context));
rpc->magic = RPC_CONTEXT_MAGIC;
- rpc->encodebuflen = 65536;
+
+ /* Allow 1M of data (for writes) and some */
+ rpc->encodebuflen = 1024 * 1024 + 4096;
rpc->encodebuf = malloc(rpc->encodebuflen);
if (rpc->encodebuf == NULL) {
free(rpc);
salt += 0x01000000;
rpc->fd = -1;
rpc->tcp_syncnt = RPC_PARAM_UNDEFINED;
-#ifdef WIN32
+#if defined(WIN32) || defined(ANDROID)
rpc->uid = 65534;
rpc->gid = 65534;
#else
void rpc_set_error(struct rpc_context *rpc, char *error_string, ...)
{
va_list ap;
+ char *old_error_string = rpc->error_string;
assert(rpc->magic == RPC_CONTEXT_MAGIC);
- if (rpc->error_string != NULL) {
- free(rpc->error_string);
- }
va_start(ap, error_string);
rpc->error_string = malloc(1024);
vsnprintf(rpc->error_string, 1024, error_string, ap);
va_end(ap);
+
+ if (old_error_string != NULL) {
+ free(old_error_string);
+ }
}
char *rpc_get_error(struct rpc_context *rpc)