Chameleon Commit Details - 1648 - Chameleon open source boot loader project.

Date:

2011-10-22 12:02:23 (12 years 6 months ago)

Author:

JrCs

Commit:

1648

Parents:

1647

Message:

Fix a little bug copyArgument: corrects the calculated length of the argument to add

Changes:

M	/trunk/i386/boot2/options.c

File differences

-1071
1072 1072
1073 1073
1074
1075
1076
1074 1077
1075 1078
1076 1079
... ...
1081 1084
1082 1085
1083 1086
1084 
1085 1087
1088
1086 1089
1087 1090
1088 1091
+    int argLen = argName ? strlen(argName) : 0;␊
    int len = argLen + cnt + 1;  // +1 to account for space␊
␊
␉if (argName)␊
␉␉len++; // +1 to account for '='␊
␊
    if (len > *cntRemainingP) {␊
        error("Warning: boot arguments too long, truncating\n");␊
        return false;␊

        *argP += argLen;␊
        *argP[0] = '=';␊
        (*argP)++;␊
        len++; // +1 to account for '='␊
    }␊
␊
    strncpy( *argP, val, cnt );␊
    *argP += cnt;␊
    *argP[0] = ' ';␊
 ...
     int argLen = argName ? strlen(argName) : 0;␊
     int len = argLen + cnt + 1;  // +1 to account for space␊
 ␊
+␉if (argName)␊
+␉␉len++; // +1 to account for '='␊
+␊
     if (len > *cntRemainingP) {␊
         error("Warning: boot arguments too long, truncating\n");␊
         return false;␊
         *argP += argLen;␊
         *argP[0] = '=';␊
         (*argP)++;␊
-        len++; // +1 to account for '='␊
     }␊
+␊
     strncpy( *argP, val, cnt );␊
     *argP += cnt;␊
     *argP[0] = ' ';␊