View | Details | Raw Unified | Return to bug 60275
Collapse All | Expand All

(-)httpd-2.4.23/server/util_fcgi.c (-4 / +14 lines)
Lines 153-159 Link Here
153
153
154
        envlen += keylen;
154
        envlen += keylen;
155
155
156
        vallen = strlen(elts[i].val);
156
	if (!elts[i].val) {
157
	    vallen = 0;
158
	} else {
159
    	    vallen = strlen(elts[i].val);
160
	}
157
161
158
        if (vallen >> 7 == 0) {
162
        if (vallen >> 7 == 0) {
159
            envlen += 1;
163
            envlen += 1;
Lines 226-232 Link Here
226
            buflen -= 4;
230
            buflen -= 4;
227
        }
231
        }
228
232
229
        vallen = strlen(elts[i].val);
233
        if (!elts[i].val) {
234
            vallen = 0;
235
        } else {
236
    	    vallen = strlen(elts[i].val);
237
	}
230
238
231
        if (vallen >> 7 == 0) {
239
        if (vallen >> 7 == 0) {
232
            if (buflen < 1) {
240
            if (buflen < 1) {
Lines 262-269 Link Here
262
            rv = APR_ENOSPC; /* overflow */
270
            rv = APR_ENOSPC; /* overflow */
263
            break;
271
            break;
264
        }
272
        }
265
        memcpy(itr, elts[i].val, vallen);
273
	if (elts[i].val) {
266
        itr += vallen;
274
    	    memcpy(itr, elts[i].val, vallen);
275
    	    itr += vallen;
276
	}
267
277
268
        if (buflen == vallen) {
278
        if (buflen == vallen) {
269
            (*starting_elem)++;
279
            (*starting_elem)++;

Return to bug 60275