Changeset 22231 for main

Timestamp:

2010-06-03T16:54:46+12:00 (14 years ago)

Author:

mdewsnip

Message:

Fix assert() failure that looks like a segmentation fault when users enter "a=" (without any action name).

Location:

main/trunk/greenstone2/runtime-src/src/recpt

Files:

• action.cpp (modified) (1 diff)
• receptionist.cpp (modified) (1 diff)

main/trunk/greenstone2/runtime-src/src/recpt/action.cpp

@@ -152 +152 @@
 action *actionmapclass::getaction (const text_t &key) {
   // can't find an action with no name
-  assert (!key.empty());
   if (key.empty()) return NULL;
 

main/trunk/greenstone2/runtime-src/src/recpt/receptionist.cpp

@@ -803 +803 @@
 
   action *a = actions.getaction (args["a"]);
-  prepare_page (a, args, text_t2ascii, logout);
+  if (a != NULL)
+  {
+    prepare_page (a, args, text_t2ascii, logout);
+  }
   disp.expandstring (displayclass::defaultpackage, astring, outstring);
   return outstring;