The right implementation of CGPT label conversion between UTF8 and UTF16.

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 226 matching lines @@
 
   if (set_begin)
     entry->starting_lba = begin;
   if (set_size)
     entry->ending_lba = begin + size - 1;
   if (set_type)
     memcpy(&entry->type, &type_guid, sizeof(Guid));
   if (set_unique)
     memcpy(&entry->unique, &unique_guid, sizeof(Guid));
   if (label) {
-    UTF8ToUTF16((uint8_t *)label, entry->name,
-                sizeof(entry->name) / sizeof(entry->name[0]));
+    if (CGPT_OK != UTF8ToUTF16((uint8_t *)label, entry->name,
+                               sizeof(entry->name) / sizeof(entry->name[0]))) {
+      goto bad;

[Bill Richardson, 2010/11/17 17:41:49]

We should print an error message indicating that the label can't be converted.

[Louis, 2010/11/18 05:35:21]

Done.

+    }
   }
   if (set_raw) {
     entry->attrs.fields.gpt_att = raw_value;
   } else {
     if (set_successful)
       SetSuccessful(&drive.gpt, PRIMARY, index, successful);
     if (set_tries)
       SetTries(&drive.gpt, PRIMARY, index, tries);
     if (set_priority)
       SetPriority(&drive.gpt, PRIMARY, index, priority);
   }
 
   RepairEntries(&drive.gpt, MASK_PRIMARY);
   RepairHeader(&drive.gpt, MASK_PRIMARY);
 
   drive.gpt.modified |= (GPT_MODIFIED_HEADER1 | GPT_MODIFIED_ENTRIES1 |
                          GPT_MODIFIED_HEADER2 | GPT_MODIFIED_ENTRIES2);
   UpdateCrc(&drive.gpt);
 
 
   // Write it all out
   return DriveClose(&drive, 1);
 
 bad:
   (void) DriveClose(&drive, 0);
   return CGPT_FAILED;
 }