Fixing the bug of CGPT when primary entry table is invalid.

cgpt/cmd_add.c

 // Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cgpt.h"
 
 #include <getopt.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ skipping 180 matching lines @@
 
   if (CGPT_OK != DriveOpen(argv[optind], &drive))
     return CGPT_FAILED;
 
   if (GPT_SUCCESS != (gpt_retval = GptSanityCheck(&drive.gpt))) {
     Error("GptSanityCheck() returned %d: %s\n",
           gpt_retval, GptError(gpt_retval));
     return CGPT_FAILED;
   }
 
+  if ((drive.gpt.valid_headers != MASK_BOTH) ||

[Hung-Te, 2010/11/17 10:37:04]

it looks a little weird for me to compare a variable with "mask" by bit-wise
compare.

I'd suggest having a special value like CGPT_INDEX_BOTH=3 then
 (drive.gpt.valid.headers & MASK_BOTH) == CGPT_INDEX_BOTH,
or at least (drive.gpt.valid.headers & MASK_BOTH) == MASK_BOTH).

[Louis, 2010/11/18 01:51:29]

Good catch. Modified as:
  (valid_header & MASK_BOTH) != MASK_BOTH

Thanks.
On 2010/11/17 10:37:04, Hung-Te wrote:

+      (drive.gpt.valid_entries != MASK_BOTH)) {
+    Error("one of the GPT header/entries is invalid.\n"
+          "please run 'cgpt repair' before adding anything.\n");
+    return CGPT_FAILED;
+  }
+
   uint32_t max_part = GetNumberOfEntries(&drive.gpt);
   if (partition) {
     if (partition > max_part) {
       Error("invalid partition number: %d\n", partition);
       goto bad;
     }
     index = partition - 1;
     entry = GetEntry(&drive.gpt, PRIMARY, index);
   } else {
     // find next empty partition
@@ skipping 55 matching lines @@
   UpdateCrc(&drive.gpt);
 
 
   // Write it all out
   return DriveClose(&drive, 1);
 
 bad:
   (void) DriveClose(&drive, 0);
   return CGPT_FAILED;
 }