Commit c8a47fa
committed
fix: harden LoggableResponseBody capture against zero-read spin and double-close
Two defects in the bounded response-body capture path:
- The bounded drain loop subtracted the read count from its remaining budget and
handled only EOF (-1) and positive reads. A delegate Source that returns 0 for a
positive byteCount — a Source.read contract violation — made the subtraction a
no-op, so the loop spun forever and hung whatever thread triggered the capture.
The loop now fails fast with an IOException on a 0-read, matching TeeSink.writeAll;
the existing failure path caches it and source() re-throws it deterministically
while snapshot() still returns the partial bytes. A 0-read is not treated as EOF,
which would silently truncate the body.
- On the over-cap path the wrapper retains the delegate's source as the live tail and
hands it out inside a one-shot prefix+tail stream. That stream's close() closed the
tail directly while the wrapper's own close() independently closed the delegate, so
for a delegate whose source() returns the same instance and whose close() closes it,
the underlying source was closed twice. Both paths now funnel through a single
closeDelegateOnce() guard under the existing lock, so whichever closes first wins and
the other is a no-op. The peek-based prefix view is still closed directly. This was
masked by the self-guarded close in the shipped Okio adapter but was latent for a
bring-your-own IoProvider.
Also tightens the over-cap source() to assert the live-tail invariant with checkNotNull
rather than silently falling back to a peek view, since the tail is always present once
control reaches that point.1 parent ea0cc81 commit c8a47fa
2 files changed
Lines changed: 157 additions & 8 deletions
File tree
- sdk-core/src
- main/kotlin/org/dexpace/sdk/core/http/response
- test/kotlin/org/dexpace/sdk/core/http/response
Lines changed: 39 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
143 | 143 | | |
144 | 144 | | |
145 | 145 | | |
146 | | - | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
147 | 150 | | |
148 | 151 | | |
149 | 152 | | |
| |||
190 | 193 | | |
191 | 194 | | |
192 | 195 | | |
193 | | - | |
194 | | - | |
195 | | - | |
196 | | - | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
197 | 199 | | |
198 | 200 | | |
199 | 201 | | |
200 | 202 | | |
201 | 203 | | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
202 | 219 | | |
203 | 220 | | |
204 | 221 | | |
| |||
244 | 261 | | |
245 | 262 | | |
246 | 263 | | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
247 | 272 | | |
248 | 273 | | |
249 | 274 | | |
| |||
285 | 310 | | |
286 | 311 | | |
287 | 312 | | |
288 | | - | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
289 | 317 | | |
290 | | - | |
| 318 | + | |
291 | 319 | | |
292 | 320 | | |
293 | 321 | | |
| |||
303 | 331 | | |
304 | 332 | | |
305 | 333 | | |
| 334 | + | |
306 | 335 | | |
307 | 336 | | |
308 | | - | |
| 337 | + | |
| 338 | + | |
| 339 | + | |
309 | 340 | | |
310 | 341 | | |
311 | 342 | | |
| |||
Lines changed: 118 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12 | 12 | | |
13 | 13 | | |
14 | 14 | | |
| 15 | + | |
15 | 16 | | |
| 17 | + | |
16 | 18 | | |
17 | 19 | | |
18 | 20 | | |
| |||
374 | 376 | | |
375 | 377 | | |
376 | 378 | | |
| 379 | + | |
| 380 | + | |
| 381 | + | |
| 382 | + | |
| 383 | + | |
| 384 | + | |
| 385 | + | |
| 386 | + | |
| 387 | + | |
| 388 | + | |
| 389 | + | |
| 390 | + | |
| 391 | + | |
| 392 | + | |
| 393 | + | |
| 394 | + | |
| 395 | + | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
| 401 | + | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
| 407 | + | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
| 412 | + | |
| 413 | + | |
| 414 | + | |
| 415 | + | |
| 416 | + | |
| 417 | + | |
| 418 | + | |
| 419 | + | |
| 420 | + | |
| 421 | + | |
| 422 | + | |
| 423 | + | |
| 424 | + | |
| 425 | + | |
| 426 | + | |
| 427 | + | |
| 428 | + | |
| 429 | + | |
| 430 | + | |
| 431 | + | |
| 432 | + | |
| 433 | + | |
| 434 | + | |
| 435 | + | |
| 436 | + | |
| 437 | + | |
| 438 | + | |
| 439 | + | |
| 440 | + | |
| 441 | + | |
| 442 | + | |
| 443 | + | |
| 444 | + | |
| 445 | + | |
| 446 | + | |
| 447 | + | |
| 448 | + | |
| 449 | + | |
| 450 | + | |
| 451 | + | |
| 452 | + | |
| 453 | + | |
| 454 | + | |
| 455 | + | |
| 456 | + | |
| 457 | + | |
| 458 | + | |
| 459 | + | |
| 460 | + | |
| 461 | + | |
| 462 | + | |
| 463 | + | |
| 464 | + | |
| 465 | + | |
| 466 | + | |
| 467 | + | |
| 468 | + | |
| 469 | + | |
| 470 | + | |
| 471 | + | |
| 472 | + | |
| 473 | + | |
| 474 | + | |
| 475 | + | |
| 476 | + | |
| 477 | + | |
| 478 | + | |
| 479 | + | |
| 480 | + | |
| 481 | + | |
| 482 | + | |
| 483 | + | |
| 484 | + | |
| 485 | + | |
| 486 | + | |
| 487 | + | |
| 488 | + | |
| 489 | + | |
| 490 | + | |
| 491 | + | |
| 492 | + | |
| 493 | + | |
| 494 | + | |
377 | 495 | | |
0 commit comments