From 9c080b27d6c0eab2c03a0fec0f3d62c06e281002 Mon Sep 17 00:00:00 2001 From: Rolf vandeVaart Date: Thu, 17 Jul 2008 19:04:40 +0000 Subject: [PATCH] Fix for bug when running 64-bit heterogeneous. This commit fixes trac:1341. This commit was SVN r18940. The following Trac tickets were found above: Ticket 1341 --> https://svn.open-mpi.org/trac/ompi/ticket/1341 --- ompi/mca/osc/pt2pt/osc_pt2pt_data_move.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ompi/mca/osc/pt2pt/osc_pt2pt_data_move.c b/ompi/mca/osc/pt2pt/osc_pt2pt_data_move.c index 5c855d58b3..93eb864617 100644 --- a/ompi/mca/osc/pt2pt/osc_pt2pt_data_move.c +++ b/ompi/mca/osc/pt2pt/osc_pt2pt_data_move.c @@ -7,6 +7,7 @@ * University of Stuttgart. All rights reserved. * Copyright (c) 2004-2005 The Regents of the University of California. * All rights reserved. + * Copyright (c) 2008 Sun Microsystems, Inc. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -797,7 +798,8 @@ ompi_osc_pt2pt_sendreq_recv_accum(ompi_osc_pt2pt_module_t *module, /* create convertor */ OBJ_CONSTRUCT(&convertor, ompi_convertor_t); - payload = (void*) malloc(buflen); + buffer = (void*) malloc(buflen); + if (NULL == buffer) return OMPI_ERR_TEMP_OUT_OF_RESOURCE; /* initialize convertor */ ompi_convertor_copy_and_prepare_for_recv(proc->proc_convertor,