1 files changed, 38 insertions, 12 deletions

diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c
index 456b6fdac0..27599f38e0 100644
--- a/erts/emulator/beam/dist.c
+++ b/erts/emulator/beam/dist.c
@@ -2307,8 +2307,18 @@ erts_dsig_send(ErtsDSigSendContext *ctx)
 
 	    ctx->data_size = ctx->max_finalize_prepend;
 	    erts_reset_atom_cache_map(ctx->acmp);
-	    erts_encode_dist_ext_size(ctx->ctl, ctx->flags, ctx->acmp, &ctx->data_size);
 
+	    switch (erts_encode_dist_ext_size(ctx->ctl, ctx->flags,
+                                              ctx->acmp, &ctx->data_size)) {
+            case ERTS_EXT_SZ_OK:
+                break;
+            case ERTS_EXT_SZ_SYSTEM_LIMIT:
+                retval = ERTS_DSIG_SEND_TOO_LRG;
+                goto done;
+            case ERTS_EXT_SZ_YIELD:
+                ERTS_INTERNAL_ERROR("Unexpected yield result");
+                break;
+            }
 	    if (is_non_value(ctx->msg)) {
                 ctx->phase = ERTS_DSIG_SEND_PHASE_ALLOC;
                 break;
@@ -2318,17 +2328,31 @@ erts_dsig_send(ErtsDSigSendContext *ctx)
             ctx->u.sc.level = 0;
 
             ctx->phase = ERTS_DSIG_SEND_PHASE_MSG_SIZE;
-	case ERTS_DSIG_SEND_PHASE_MSG_SIZE:
-            if (!ctx->no_trap) {
-                if (erts_encode_dist_ext_size_int(ctx->msg, ctx, &ctx->data_size)) {
-                    retval = ERTS_DSIG_SEND_CONTINUE;
-                    goto done;
-                }
-            } else {
-                erts_encode_dist_ext_size(ctx->msg, ctx->flags, ctx->acmp, &ctx->data_size);
+	case ERTS_DSIG_SEND_PHASE_MSG_SIZE: {
+            ErtsExtSzRes sz_res;
+            sz_res = (!ctx->no_trap
+                      ? erts_encode_dist_ext_size_ctx(ctx->msg,
+                                                      ctx,
+                                                      &ctx->data_size)
+                      : erts_encode_dist_ext_size(ctx->msg,
+                                                  ctx->flags,
+                                                  ctx->acmp,
+                                                  &ctx->data_size));
+            switch (sz_res) {
+            case ERTS_EXT_SZ_OK:
+                break;
+            case ERTS_EXT_SZ_SYSTEM_LIMIT:
+                retval = ERTS_DSIG_SEND_TOO_LRG;
+                goto done;
+            case ERTS_EXT_SZ_YIELD:
+                if (ctx->no_trap)
+                    ERTS_INTERNAL_ERROR("Unexpected yield result");
+                retval = ERTS_DSIG_SEND_CONTINUE;
+                goto done;
             }
 
 	    ctx->phase = ERTS_DSIG_SEND_PHASE_ALLOC;
+        }
 	case ERTS_DSIG_SEND_PHASE_ALLOC:
 	    erts_finalize_atom_cache_map(ctx->acmp, ctx->flags);
 
@@ -3756,10 +3780,12 @@ int distribution_info(fmtfn_t to, void *arg)	/* Called by break handler */
 BIF_RETTYPE setnode_2(BIF_ALIST_2)
 {
     Process *net_kernel;
-    Uint32 creation;
+    Uint creation;
 
     /* valid creation ? */
-    if(!term_to_Uint32(BIF_ARG_2, &creation))
+    if(!term_to_Uint(BIF_ARG_2, &creation))
+	goto error;
+    if(creation > 3)
 	goto error;
 
     /* valid node name ? */
@@ -3803,7 +3829,7 @@ BIF_RETTYPE setnode_2(BIF_ALIST_2)
     erts_proc_unlock(BIF_P, ERTS_PROC_LOCK_MAIN);
     erts_thr_progress_block();
     inc_no_nodes();
-    erts_set_this_node(BIF_ARG_1, creation);
+    erts_set_this_node(BIF_ARG_1, (Uint32) creation);
     erts_is_alive = 1;
     send_nodes_mon_msgs(NULL, am_nodeup, BIF_ARG_1, am_visible, NIL);
     erts_thr_progress_unblock();