From a932334e4d700662c7c67d43997b4a662467fa6f Mon Sep 17 00:00:00 2001 From: Stefan Sayer Date: Tue, 19 May 2009 14:23:37 +0000 Subject: [PATCH] correct pop() on empty AmArg git-svn-id: http://svn.berlios.de/svnroot/repos/sems/trunk@1392 8eb893ce-cfd4-0310-b710-fb5ebe64c474 --- core/AmArg.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core/AmArg.cpp b/core/AmArg.cpp index fed45e33..dc7f0083 100644 --- a/core/AmArg.cpp +++ b/core/AmArg.cpp @@ -177,6 +177,12 @@ void AmArg::push(const string &key, const AmArg &val) { void AmArg::pop(AmArg &a) { assertArray(); + if (!size()) { + if (a.getType() == AmArg::Undef) + return; + a = AmArg(); + return; + } a = v_array->front(); v_array->erase(v_array->begin()); }