Page MenuHomeFreeBSD

Various fixes to the load() function.
ClosedPublic

Authored by jhb on Sep 1 2020, 4:22 PM.
Tags
None
Referenced Files
F102987040: D26278.diff
Tue, Nov 19, 12:34 PM
F102987030: D26278.diff
Tue, Nov 19, 12:34 PM
Unknown Object (File)
Mon, Nov 11, 7:43 AM
Unknown Object (File)
Wed, Nov 6, 1:31 PM
Unknown Object (File)
Oct 16 2024, 10:41 PM
Unknown Object (File)
Oct 16 2024, 10:41 PM
Unknown Object (File)
Oct 14 2024, 6:57 PM
Unknown Object (File)
Oct 11 2024, 10:31 AM
Subscribers

Details

Summary
  • Use getline() instead of fgetln(). This ensures the returned string is always null-terminated without losing the last character if the last line in a file doesn't have a newline. Also, while fgetln says the returned buffer can be modified, that doesn't actually seem safe as the current implementation means you are modifying stdio's internal buffer.
  • Remove a spurious if before an ATF_REQUIRE that was clearly supposed to be non-optional.
  • Remove a pointless compare of 'ptr' against '\0' (really NULL) that duplicated the middle condition in the for().
  • Once a comment is found, skip the rest of the line, not just the current word.
Test Plan
  • ran the resolv_test tests

Diff Detail

Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 33299
Build 30620: arc lint + arc unit

Event Timeline

jhb requested review of this revision.Sep 1 2020, 4:22 PM
jhb created this revision.
lib/libc/tests/resolv/resolv_test.c
88

free(line);

LGTM modulo the memory leak pointed out by brooks.

  • Free the line in load().
This revision is now accepted and ready to land.Sep 3 2020, 2:27 PM
This revision was automatically updated to reflect the committed changes.