]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Merge pull request #10804 from poettering/sd-boot-updates
authorLennart Poettering <lennart@poettering.net>
Fri, 16 Nov 2018 16:52:37 +0000 (17:52 +0100)
committerGitHub <noreply@github.com>
Fri, 16 Nov 2018 16:52:37 +0000 (17:52 +0100)
various sd-boot/EFI fixes (split out from #10495)

1  2 
src/boot/efi/util.c

index b70777292e0ba9e20501217222b43798654dc3b0,320b12ef850d893c8c57026c2f5cb2926ee5054a..f1f1674c59493f031db986044fbd5c699948a7a3
@@@ -56,10 -56,13 +56,13 @@@ UINT64 time_usec(VOID) 
                          return 0;
          }
  
 -        return 1000 * 1000 * ticks / freq;
 +        return 1000UL * 1000UL * ticks / freq;
  }
  
- EFI_STATUS parse_boolean(CHAR8 *v, BOOLEAN *b) {
+ EFI_STATUS parse_boolean(const CHAR8 *v, BOOLEAN *b) {
+         if (!v)
+                 return EFI_INVALID_PARAMETER;
          if (strcmpa(v, (CHAR8 *)"1") == 0 ||
              strcmpa(v, (CHAR8 *)"yes") == 0 ||
              strcmpa(v, (CHAR8 *)"y") == 0 ||