Changeset 5503 for squid-ssl/trunk/fuentes/src/esi/Esi.cc

Timestamp:

Jul 13, 2017, 11:11:39 AM (4 years ago)

Author:

Juanma

Message:

Initial release

File:

• squid-ssl/trunk/fuentes/src/esi/Esi.cc (modified) (9 diffs)

squid-ssl/trunk/fuentes/src/esi/Esi.cc

@@ -574 +574 @@
 #endif
 
-    if (!(rep != NULL || (outbound.getRaw() &&
+    if (!(rep || (outbound.getRaw() &&
                   outbound->len && (outbound_offset <= outbound->len)))) {
         debugs(86, 5, "ESIContext::send: Nothing to send.");
@@ -619 +619 @@
     debugs(86, 5, "ESIContext::send: this=" << this << " Client no longer wants data ");
     /* Deal with re-entrancy */
-    HttpReply::Pointer temprep = rep;
+    HttpReply *temprep = rep;
     rep = NULL; /* freed downstream */
 
-    if (temprep != NULL && varState)
-        varState->buildVary(temprep.getRaw());
+    if (temprep && varState)
+        varState->buildVary (temprep);
 
     {
@@ -630 +630 @@
         tempBuffer.offset = pos - len;
         tempBuffer.data = next->readBuffer.data;
-        clientStreamCallback (thisNode, http, temprep.getRaw(), tempBuffer);
+        clientStreamCallback (thisNode, http, temprep, tempBuffer);
     }
 
@@ -967 +967 @@
     int specifiedattcount = attrCount * 2;
     char *position;
-    Must(ellen < sizeof(localbuf)); /* prevent unexpected overruns. */
+    assert (ellen < sizeof (localbuf)); /* prevent unexpected overruns. */
 
     debugs(86, 5, "ESIContext::Start: element '" << el << "' with " << specifiedattcount << " tags");
@@ -981 +981 @@
         localbuf[0] = '<';
         localbuf[1] = '\0';
-        xstrncpy(&localbuf[1], el, sizeof(localbuf) - 2);
+        assert (xstrncpy (&localbuf[1], el, sizeof(localbuf) - 2));
         position = localbuf + strlen (localbuf);
 
         for (i = 0; i < specifiedattcount && attr[i]; i += 2) {
-            Must(static_cast<size_t>(position - localbuf) < sizeof(localbuf) - 1);
             *position = ' ';
             ++position;
             /* TODO: handle thisNode gracefully */
-            xstrncpy(position, attr[i], sizeof(localbuf) - (position - localbuf));
+            assert (xstrncpy (position, attr[i], sizeof(localbuf) + (position - localbuf)));
             position += strlen (position);
-            Must(static_cast<size_t>(position - localbuf) < sizeof(localbuf) - 2);
             *position = '=';
             ++position;
@@ -1000 +998 @@
             while ((ch = *chPtr++) != '\0') {
                 if (ch == '\"') {
-                    Must(static_cast<size_t>(position - localbuf) < sizeof(localbuf) - 6);
-                    xstrncpy(position, "&quot;", sizeof(localbuf) - (position-localbuf));
+                    assert( xstrncpy(position, "&quot;", sizeof(localbuf) + (position-localbuf)) );
                     position += 6;
                 } else {
-                    Must(static_cast<size_t>(position - localbuf) < sizeof(localbuf) - 1);
                     *position = ch;
                     ++position;
                 }
             }
-            Must(static_cast<size_t>(position - localbuf) < sizeof(localbuf) - 1);
+            position += strlen (position);
             *position = '\"';
             ++position;
         }
 
-        Must(static_cast<size_t>(position - localbuf) < sizeof(localbuf) - 2);
         *position = '>';
         ++position;
@@ -1100 +1095 @@
 
     case ESIElement::ESI_ELEMENT_NONE:
-        Must(ellen < sizeof(localbuf) - 3); /* prevent unexpected overruns. */
+        assert (ellen < sizeof (localbuf)); /* prevent unexpected overruns. */
         /* Add elements we aren't interested in */
         localbuf[0] = '<';
         localbuf[1] = '/';
-        xstrncpy(&localbuf[2], el, sizeof(localbuf) - 3);
+        assert (xstrncpy (&localbuf[2], el, sizeof(localbuf) - 3));
         position = localbuf + strlen (localbuf);
         *position = '>';
@@ -1260 +1255 @@
     }
 
-    if (rep != NULL && !parserState.inited())
+    if (rep && !parserState.inited())
         parserState.init(this);
 
@@ -1399 +1394 @@
     debugs(86, 5, HERE << "Freeing for this=" << this);
 
-    rep = NULL; // refcounted
+    HTTPMSGUNLOCK(rep);
 
     finishChildren ();