ICU-9326 Fix icupkg tool trap on Windows static build

X-SVN-Rev: 31828

diff --git a/icu4c/source/tools/icupkg/icupkg.cpp b/icu4c/source/tools/icupkg/icupkg.cpp
index eb198fdedc8f83da0f652a2c1620cbe472813e02..8001ec2ae93fb29345e1c40d514c99134bb60bdc 100644 (file)
--- a/icu4c/source/tools/icupkg/icupkg.cpp
+++ b/icu4c/source/tools/icupkg/icupkg.cpp
@@ -1,7 +1,7 @@
 /*
 *******************************************************************************
 *
-*   Copyright (C) 2005-2010, International Business Machines
+*   Copyright (C) 2005-2012, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
@@ -402,8 +402,12 @@ main(int argc, char *argv[]) {
 
     /* extract items */
     if(options[OPT_EXTRACT_LIST].doesOccur) {
-        listPkg=readList(NULL, options[OPT_EXTRACT_LIST].value, FALSE);
-        if(listPkg!=NULL) {
+        listPkg=new Package();
+        if(listPkg==NULL) {
+            fprintf(stderr, "icupkg: not enough memory\n");
+            exit(U_MEMORY_ALLOCATION_ERROR);
+        }
+        if(!readList(NULL, options[OPT_EXTRACT_LIST].value, FALSE, listPkg)) {
             pkg->extractItems(destPath, *listPkg, outType);
             delete listPkg;
         } else {

diff --git a/icu4c/source/tools/toolutil/pkg_icu.cpp b/icu4c/source/tools/toolutil/pkg_icu.cpp
index 7af5b1c14188d3a1120ed02beb50f6ea3423236b..f2a2d5ffe599d2eb3c7edda11708bee872ac24a5 100644 (file)
--- a/icu4c/source/tools/toolutil/pkg_icu.cpp
+++ b/icu4c/source/tools/toolutil/pkg_icu.cpp
@@ -1,5 +1,5 @@
 /******************************************************************************
- *   Copyright (C) 2008-2009, International Business Machines
+ *   Copyright (C) 2008-2012, International Business Machines
  *   Corporation and others.  All Rights Reserved.
  *******************************************************************************
  */
@@ -56,8 +56,8 @@ isListTextFile(const char *listname) {
  * Otherwise, read the file itself as a single-item list.
  */
 U_CAPI Package * U_EXPORT2
-readList(const char *filesPath, const char *listname, UBool readContents) {
-    Package *listPkg;
+readList(const char *filesPath, const char *listname, UBool readContents, Package *listPkgIn) {
+    Package *listPkg = listPkgIn;
     FILE *file;
     const char *listNameEnd;
 
@@ -66,10 +66,12 @@ readList(const char *filesPath, const char *listname, UBool readContents) {
         return NULL;
     }
 
-    listPkg=new Package();
-    if(listPkg==NULL) {
-        fprintf(stderr, "icupkg: not enough memory\n");
-        exit(U_MEMORY_ALLOCATION_ERROR);
+    if (listPkg == NULL) {
+        listPkg=new Package();
+        if(listPkg==NULL) {
+            fprintf(stderr, "icupkg: not enough memory\n");
+            exit(U_MEMORY_ALLOCATION_ERROR);
+        }
     }
 
     listNameEnd=strchr(listname, 0);

diff --git a/icu4c/source/tools/toolutil/pkg_icu.h b/icu4c/source/tools/toolutil/pkg_icu.h
index 75e2edd02d549573a06c03e4560303ec6904cf3a..7b652cd8997b799927bc9bcd11b026be69edc054 100644 (file)
--- a/icu4c/source/tools/toolutil/pkg_icu.h
+++ b/icu4c/source/tools/toolutil/pkg_icu.h
@@ -1,5 +1,5 @@
 /******************************************************************************
- *   Copyright (C) 2008-2011, International Business Machines
+ *   Copyright (C) 2008-2012, International Business Machines
  *   Corporation and others.  All Rights Reserved.
  *******************************************************************************
  */
@@ -17,6 +17,6 @@ writePackageDatFile(const char *outFilename, const char *outComment,
                     char outType);
 
 U_CAPI icu::Package * U_EXPORT2
-readList(const char *filesPath, const char *listname, UBool readContents);
+readList(const char *filesPath, const char *listname, UBool readContents, Package *listPkgIn = NULL);
 
 #endif