Changeset 1268

Timestamp:

2000-07-04T14:15:22+12:00 (24 years ago)

Author:

sjboddie

Message:

fixed bug causing segmentation fault when an invalid collection
was supplied as the "c" cgi argument

File:

• trunk/gsdl/src/recpt/receptionist.cpp (modified) (2 diffs)

trunk/gsdl/src/recpt/receptionist.cpp

@@ -28 +28 @@
 /*
    $Log$
+   Revision 1.52  2000/07/04 02:15:22  sjboddie
+   fixed bug causing segmentation fault when an invalid collection
+   was supplied as the "c" cgi argument
+
    Revision 1.51  2000/05/28 09:15:34  sjboddie
    a few small changes to get an initial release of the local library
@@ -1114 +1118 @@
 
     text_t &arg_c = args["c"];
-    ColInfoResponse_t cinfo;
-    comerror_t err;
     recptproto *collectproto = protocols.getrecptproto (arg_c, logout);
-    collectproto->get_collectinfo (arg_c, cinfo, err, logout);
-
-    if (!cinfo.ccsCols.empty()) {
-      args["ccs"] = 1;
-      if (args["cc"].empty()) {
-    text_tarray::const_iterator col_here = cinfo.ccsCols.begin();
-    text_tarray::const_iterator col_end = cinfo.ccsCols.end();
-    bool first = true;
-    while (col_here != col_end) {
-      // make sure it's a valid collection
-      if (protocols.getrecptproto (*col_here, logout) != NULL) {
-        if (!first) args["cc"].push_back (',');
-        args["cc"] += *col_here;
-        first = false;
+    if (collectproto == NULL) {
+      // oops, this collection isn't valid
+      outconvertclass text_t2ascii;
+      logout << text_t2ascii << "ERROR: Invalid collection: " << arg_c << "\n";
+      args["c"].clear();
+
+    } else {
+      ColInfoResponse_t cinfo;
+      comerror_t err;
+
+      collectproto->get_collectinfo (arg_c, cinfo, err, logout);
+
+      if (!cinfo.ccsCols.empty()) {
+    args["ccs"] = 1;
+    if (args["cc"].empty()) {
+      text_tarray::const_iterator col_here = cinfo.ccsCols.begin();
+      text_tarray::const_iterator col_end = cinfo.ccsCols.end();
+      bool first = true;
+      while (col_here != col_end) {
+        // make sure it's a valid collection
+        if (protocols.getrecptproto (*col_here, logout) != NULL) {
+          if (!first) args["cc"].push_back (',');
+          args["cc"] += *col_here;
+          first = false;
+        }
+        col_here ++;
       }
-      col_here ++;
     }
       }