From 7904025c9badeb1c9fd293b9f60df0e1b7b73b92 Mon Sep 17 00:00:00 2001 From: mintsuki Date: Fri, 24 Apr 2020 17:02:53 +0200 Subject: [PATCH] Fix bug where config file values with a colon were interpreted as entries --- qloader2.bin | Bin 32768 -> 32768 bytes src/lib/config.c | 2 ++ 2 files changed, 2 insertions(+) diff --git a/qloader2.bin b/qloader2.bin index 32234f3d8dfc51c6581bc750741a930bdf00ef4b..0dc85c126c5ce4d6951b5b36a6a4ecc05941edcb 100644 GIT binary patch delta 3974 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 amo=Wu^qjL=CD{2OtuBVl^_0}Tk@!D?B7e*P delta 4008 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 diff --git a/src/lib/config.c b/src/lib/config.c index 70068596..987afce6 100644 --- a/src/lib/config.c +++ b/src/lib/config.c @@ -63,6 +63,8 @@ int config_set_entry(size_t index) { p++; } p++; + if (*(p - 2) != '\n') + i--; } config_addr = p;