Commit ae1bae83 authored by EVPath Upstream's avatar EVPath Upstream Committed by Atkins, Charles Vernon
Browse files

EVPath 2018-04-26 (cba5b736) 

Code extracted from:

    https://github.com/GTkorvo/EVPath.git

at commit cba5b736359519db1ac7dec3d5a4eb857022a246 (master).

Upstream Shortlog
-----------------

Chuck Atkins (1):
      f31c4237 Fix an oob error in error message reporting

Greg Eisenhauer (1):
      a5ff802c Don't reference cm_format outside lock-held region
parent 3f606a46

cm.c

+3 −2
Original line number Diff line number Diff line
@@ -2511,14 +2511,15 @@ INT_CMConnection_failed(CMConnection conn) 
     CMtrace_out(cm, CMFreeVerbose, "CM - add reference connection %p - handler\n", conn);

     INT_CMConnection_add_reference(conn);

     {

         CMHandlerFunc handler = cm_format->handler;

	 void *client_data = cm_format->client_data;

	 CMbuffer local = NULL;

	 if ((cm_buffer == NULL) && (decode_buffer == NULL)) {

	     local = fill_cmbuffer(cm, buffer, length);

	     buffer = local->buffer;

	 }

	 CManager_unlock(cm);

	 cm_format->handler(cm, conn, decode_buffer, cm_format->client_data,

			    attrs);

	 handler(cm, conn, decode_buffer, client_data, attrs);

	 CManager_lock(cm);

	 if (local) cm_return_data_buf(cm, local);

	 CMtrace_out(cm, CMFreeVerbose, "CM - delete reference connection %p - handler\n", conn);

ev_dfg.c

+11 −3
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ perform_actions_on_nodes(EVdfg_configuration config, EVmaster master) 
	    break;

	}

	default:

	    printf("Bad action in perform_action_on_nodes %s (%d)\n", ACT_string[act.type], act.type);

	    printf("Bad action in perform_action_on_nodes %d\n", act.type);

	    break;

	}

    }
@@ -705,9 +705,17 @@ EVdfg_perform_act_on_state(EVdfg_configuration config, EVdfg_config_action act, 
	break;

    }

    default:

	switch(act.type) {

	case ACT_no_op:

	case ACT_freeze:

	case ACT_unfreeze:

	    printf("Bad action in perform_act_on_state %s (%d)\n", ACT_string[act.type], act.type);

	return 0;

	    break;

	default:

	    printf("Bad action in perform_act_on_state %d\n", act.type);

	    break;

	}

	return 0;

    }

    return 1;

}