Page MenuHomeFreeBSD

Various fixes to the load() function.
ClosedPublic

Authored by jhb on Sep 1 2020, 4:22 PM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Oct 15, 1:02 AM
Unknown Object (File)
Tue, Oct 14, 4:17 PM
Unknown Object (File)
Tue, Oct 14, 4:17 PM
Unknown Object (File)
Tue, Oct 14, 4:17 PM
Unknown Object (File)
Tue, Oct 14, 3:25 AM
Unknown Object (File)
Fri, Oct 10, 12:49 PM
Unknown Object (File)
Fri, Oct 10, 3:56 AM
Unknown Object (File)
Thu, Oct 9, 11:40 PM
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

Repository
rS FreeBSD src repository - subversion
Lint
Lint Not Applicable
Unit
Tests Not Applicable

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 ↗(On Diff #76498)

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.