From 63955ece14291ac06142fa710a68c6e379ab01f4 Mon Sep 17 00:00:00 2001
From: lihucheng <lihucheng1@huawei.com>
Date: Tue, 8 Mar 2022 15:35:25 +0800
Subject: [PATCH] Fix code defects issue:
 https://gitee.com/openharmony/third_party_quickjs/issues/I4WV6B
 Signed-off-by: lihucheng <lihucheng1@huawei.com>

 On branch master
 Your branch is up to date with 'origin/master'.

Signed-off-by: lihucheng <lihucheng1@huawei.com>
---
 BUILD.gn      | 27 ++++++++++-----------------
 OAT.xml       | 33 ---------------------------------
 unicode_gen.c | 16 ++++++++++------
 3 files changed, 20 insertions(+), 56 deletions(-)

diff --git a/BUILD.gn b/BUILD.gn
index 4899046..2e13ebb 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -1,22 +1,15 @@
-#Copyright (c) 2021 Huawei Device Co., Ltd.
+# Copyright (c) 2021 Huawei Device Co., Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
+#     http://www.apache.org/licenses/LICENSE-2.0
 #
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 import("//build/ohos.gni")
 
diff --git a/OAT.xml b/OAT.xml
index 2e08586..80fccfb 100755
--- a/OAT.xml
+++ b/OAT.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright (c) 2021 Huawei Device Co., Ltd.
-
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
@@ -12,39 +11,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
-
-    This is the configuration file template for OpenHarmony OSS Audit Tool, please copy it to your project root dir and modify it refer to OpenHarmony/tools_oat/README.
-    All configurations in this file will be merged to OAT-Default.xml, if you have any questions or concerns, please create issue in OpenHarmony/tools_oat and @jalenchen or chenyaxun.
-
-    licensefile:
-    1.If the project don't have "LICENSE" in root dir, please define all the license files in this project in , OAT will check license files according to this rule.
-
-    policylist:
-    1. policy: If the OAT-Default.xml policies do not meet your requirements, please add policies here.
-    2. policyitem: The fields type, name, path, desc is required, and the fields rule, group, filefilter is optional,the default value is:
-    <policyitem type="" name="" path="" desc="" rule="may" group="defaultGroup" filefilter="defaultPolicyFilter"/>
-    3. policyitem type:
-        "compatibility" is used to check license compatibility in the specified path;
-        "license" is used to check source license header in the specified path;
-        "copyright" is used to check source copyright header in the specified path;
-        "import" is used to check source dependency in the specified path, such as import ... ,include ...
-        "filetype" is used to check file type in the specified path, supported file types: archive, binary
-        "filename" is used to check whether the specified file exists in the specified path(projectroot means the root dir of the project), supported file names: LICENSE, README, README.OpenSource
-    4. policyitem name: This field is used for define the license, copyright, "*" means match all, the "!" prefix means could not match this value. For example, "!GPL" means can not use GPL license.
-    5. policyitem path: This field is used for define the source file scope to apply this policyitem, the "!" prefix means exclude the files. For example, "!.*/lib/.*" means files in lib dir will be exclude while process this policyitem.
-    6. policyitem rule and group: These two fields are used together to merge policy results. "may" policyitems in the same group means any one in this group passed, the result will be passed.
-    7. policyitem filefilter: Used to bind filefilter which define filter rules.
-    7. policyitem desc: Used to describe the reason of this policy item, committers will check this while merging the code.
-    8. filefilter: Filter rules, the type filename is used to filter file name, the type filepath is used to filter file path.
-
-    Note:If the text contains special characters, please escape them according to the following rules:
-    " == &quot;
-    & == &amp;
-    ' == &apos;
-    < == &lt;
-    > == &gt;
 -->
-
 <configuration>
     <oatconfig>
         <licensefile>LICENSE</licensefile>
diff --git a/unicode_gen.c b/unicode_gen.c
index f18aaa0..dd76123 100644
--- a/unicode_gen.c
+++ b/unicode_gen.c
@@ -101,18 +101,22 @@ const char *get_field_buf(char *buf, size_t buf_size, const char *p, int n)
 
 void add_char(int **pbuf, int *psize, int *plen, int c)
 {
-    int len, size, *buf;
-    buf = *pbuf;
+    int len, size;
     size = *psize;
     len = *plen;
     if (len >= size) {
         size = *psize;
         size = max_int(len + 1, size * 3 / 2);
-        buf = realloc(buf, sizeof(buf[0]) * size);
-        *pbuf = buf;
-        *psize = size;
+        int *buf = realloc(*pbuf, sizeof((*pbuf)[0]) * size);
+        if (!buf) {
+            sprintf(stderr, "relloc failed. file:%s func:%s line:%d", __FILE__, __FUNCTION__, __LINE__);
+            exit(1);
+        } else {
+            *pbuf = buf;
+            *psize = size;
+        }
     }
-    buf[len++] = c;
+    (*pbuf)[len++] = c;
     *plen = len;
 }
 
-- 
Gitee