This stuff is hard to write automated tests for, hence there are none.

The patch is mostly straightforward: capture errno with new variable err at point of possible error when intervening calculation is needed before testing the value of errno. This seems like a good idea.

There is one relocation of memory freeing and the additions of
+        if (res >= 0)
+            break;
which I cannot evaluate.