From a2ddb8efe5733c8fc371b2063fef4d7a39e6de63 Mon Sep 17 00:00:00 2001 From: Thibaut Paumard Date: Tue, 21 Oct 2014 14:15:34 +0200 Subject: [PATCH] Release 0.2.3 * Fix minor memory-management bug in yorick-gyoto_Scenery.C Signed-off-by: Thibaut Paumard --- ChangeLog | 17 ++++++++++++++--- yorick/gyoto_Scenery.C | 5 ++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index dfbf40c2..1a6558df 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,15 +1,26 @@ commit unknown Author: Thibaut Paumard -Date: Tue Sep 19 14:47:16 2014 +0200 +Date: Tue Oct 21 14:08:33 2014 +0200 - Released 0.2.2 + Release 0.2.3 + * Fix minor memory-management bug in yorick-gyoto_Scenery.C + + Signed-off-by: Thibaut Paumard + +commit fa5c38593c5d49d35ad6744522beb011477c57ea +Author: Thibaut Paumard +Date: Fri Sep 19 14:47:33 2014 +0200 + + Release 0.2.2 + + Signed-off-by: Thibaut Paumard commit 44a8a2536af0e51e50831c8f151432d9f83fe24f Author: Thibaut Paumard Date: Tue Sep 9 11:22:24 2014 +0200 Correct also the generic implementation of circularVelocity() - + Conflicts: lib/PolishDoughnut.C diff --git a/yorick/gyoto_Scenery.C b/yorick/gyoto_Scenery.C index 214632e8..4dece639 100644 --- a/yorick/gyoto_Scenery.C +++ b/yorick/gyoto_Scenery.C @@ -195,9 +195,8 @@ extern "C" { long dims[2] = { rquant, nk }; ystring_t *squant = ypush_q(dims); long k = 0; - char *tk = - strtok(const_cast((*OBJ)->getRequestedQuantitiesString().c_str()), - " \n\t"); + string requested=(*OBJ)->getRequestedQuantitiesString(); + char *tk = strtok(const_cast(requested.c_str()), " \n\t"); while (tk!=NULL) { if (k>=nk) y_error("BUG: too many tokens in quantity list"); squant[k++] = p_strcpy(tk);