[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [PATCH] Prevent segfault when network install method fails in loader.



>> diff --git a/loader/loader.c b/loader/loader.c
>> index 7b3eb0c..f960c28 100644
>> --- a/loader/loader.c
>> +++ b/loader/loader.c
>> @@ -1378,7 +1378,7 @@ static char *doLoaderMain(struct loaderData_s *loaderData,
>>                                        _("OK"), _("Back"), NULL);
>>                   }
>>
>> -                if (rc&&  rc != 1) {
>> +                if (rc&&  (rc != 1)&&  (loaderData->method == -1)) {
>>                       loaderData->method = -1;
>>                       step = STEP_KBD;
>>                       dir = -1;
>
> Ugh, ok just having a bad day.  That if statement should read:
>
> if ((rc && rc != 1) || (loaderData->method == -1)) {

Looks okay, I suppose.  This kind of stuff is notoriously hard to get
right, so I hope you gave it a good bit of testing.

- Chris


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]