Changeset 18313 for gsdl/trunk

Timestamp:

06.01.2009 13:26:48 (11 years ago)

Author:

davidb

Message:

Fixed bug to do with initialization of RequestFields? variable. Had been using a memset to make it all zero, but this is not a safe thing to do when there are text_t fields in the class. Code upgraded to use a constructor and 'reset' function that explicitly initializes and clears the text_t fields

Location:

gsdl/trunk/runtime-src/src/w32server

Files:

• httpreq.cpp (modified) (2 diffs)
• httpreq.h (modified) (2 diffs)

gsdl/trunk/runtime-src/src/w32server/httpreq.cpp

@@ -212 +212 @@
 }
 
+void resetRequestFieldsT(RequestFieldsT& RequestFields)
+{
+  // Can't just 'memset' the text_t fields (as used to be done),
+  // as this could lead to inconsistent state in text_t fields
+  // ultimately resulting in a segmentation fault
+  // => need to go through an explicitly reset them
+
+  //Simple request line info v0.9
+  RequestFields.MethodStr.clear();
+  RequestFields.URIStr.clear();
+  //added v1.0
+  RequestFields.VersionStr.clear();
+  //General Header
+  RequestFields.DateStr.clear();
+  RequestFields.MIMEVerStr.clear();
+  RequestFields.PragmaStr.clear();
+  //Request Header
+  RequestFields.AuthorizationStr.clear();
+  RequestFields.FromStr.clear();
+  RequestFields.IfModSinceStr.clear();
+  RequestFields.RefererStr.clear();
+  RequestFields.UserAgentStr.clear();
+  //Entity Header (Only CGI stuff)
+  RequestFields.ContentEncodingStr.clear();
+  RequestFields.ContentTypeStr.clear();
+  RequestFields.ContentLengthStr.clear();
+  //v1.0 Optional (the more common ones)
+  RequestFields.AcceptStr.clear();
+  RequestFields.AcceptLangStr.clear();
+  //v1.1 Exentions
+  RequestFields.ConnectionStr.clear();
+  
+  //Reset all the non text_t fields 
+  RequestFields.ContentLength = 0;
+  RequestFields.Content = NULL;
+  RequestFields.NumOtherHeaders = 0;
+ 
+  for (int i=0 ; i<MAX_OTHER_HEADERS; i++) {
+    RequestFields.OtherHeaders[i].Var.clear();
+    RequestFields.OtherHeaders[i].Val.clear();
+  }
+}
+
 /******************************************************************************/
 int GetHTTPHeaders(RequestInfoT &RequestInfo, RequestFieldsT &RequestFields) {
@@ -226 +269 @@
   text_t::const_iterator end;
 
-  //Clear all the fields
-  memset(&RequestFields, 0, sizeof(RequestFieldsT));
+  resetRequestFieldsT(RequestFields);
 
   ReadBufferIndex = 0;

gsdl/trunk/runtime-src/src/w32server/httpreq.h

@@ -61 +61 @@
   text_t Var;
   text_t Val;
+
+  RequestHeaderT() 
+  : Var(), Val()
+  {}
 };
 
@@ -95 +99 @@
   int NumOtherHeaders;
   RequestHeaderT OtherHeaders[MAX_OTHER_HEADERS];
+
+  RequestFieldsT()
+  : MethodStr(), URIStr(), VersionStr(), DateStr(), MIMEVerStr(),
+    PragmaStr(), AuthorizationStr(), FromStr(), IfModSinceStr(),
+    RefererStr(), UserAgentStr(), ContentEncodingStr(),
+    ContentTypeStr(), ContentLengthStr(), AcceptStr(),
+    AcceptLangStr(), ConnectionStr(),
+    OtherHeaders()
+  {
+    ContentLength = 0;
+    Content = NULL;
+    NumOtherHeaders = 0;
+  }
+
 };