s/strndup/xstrndup/ - check memory allocations for failure.

git-svn-id: http://opkg.googlecode.com/svn/trunk@256 e8e0d7a0-c8d9-11dd-a880-a1081c7ac358

diff --git a/libopkg/opkg.c b/libopkg/opkg.c
index 9cbbe906c65893ba3a5fa4cfcc6a4a424c089a06..437544007edbb144355a1d97cca38fbef8fa8d24 100644 (file)
--- a/libopkg/opkg.c
+++ b/libopkg/opkg.c
@@ -1043,7 +1043,7 @@ int opkg_repository_accessibility_check(opkg_t *opkg)
   {
     if (strstr(((pkg_src_t *)iter->data)->value, "://") && 
                    index(strstr(((pkg_src_t *)iter->data)->value, "://") + 3, '/')) 
   {
     if (strstr(((pkg_src_t *)iter->data)->value, "://") && 
                    index(strstr(((pkg_src_t *)iter->data)->value, "://") + 3, '/')) 

-      stmp = strndup(((pkg_src_t *)iter->data)->value, 
+      stmp = xstrndup(((pkg_src_t *)iter->data)->value, 

                      (index(strstr(((pkg_src_t *)iter->data)->value, "://") + 3, '/') - ((pkg_src_t *)iter->data)->value)*sizeof(char));
 
     else
                      (index(strstr(((pkg_src_t *)iter->data)->value, "://") + 3, '/') - ((pkg_src_t *)iter->data)->value)*sizeof(char));
 
     else

diff --git a/libopkg/opkg_conf.c b/libopkg/opkg_conf.c
index 57c670edca340313346383c989dd1dcecf621379..a273c3076897563837dc534affb0745f136e70bc 100644 (file)
--- a/libopkg/opkg_conf.c
+++ b/libopkg/opkg_conf.c
@@ -568,29 +568,29 @@ static int opkg_conf_parse_file(opkg_conf_t *conf, const char *filename,
 
          /* This has to be so ugly to deal with optional quotation marks */
          if (regmatch[2].rm_so > 0) {
 
          /* This has to be so ugly to deal with optional quotation marks */
          if (regmatch[2].rm_so > 0) {

-              type = strndup(line + regmatch[2].rm_so,
+              type = xstrndup(line + regmatch[2].rm_so,

                              regmatch[2].rm_eo - regmatch[2].rm_so);
          } else {
                              regmatch[2].rm_eo - regmatch[2].rm_so);
          } else {

-              type = strndup(line + regmatch[3].rm_so,
+              type = xstrndup(line + regmatch[3].rm_so,

                              regmatch[3].rm_eo - regmatch[3].rm_so);
          }
          if (regmatch[5].rm_so > 0) {
                              regmatch[3].rm_eo - regmatch[3].rm_so);
          }
          if (regmatch[5].rm_so > 0) {

-              name = strndup(line + regmatch[5].rm_so,
+              name = xstrndup(line + regmatch[5].rm_so,

                              regmatch[5].rm_eo - regmatch[5].rm_so);
          } else {
                              regmatch[5].rm_eo - regmatch[5].rm_so);
          } else {

-              name = strndup(line + regmatch[6].rm_so,
+              name = xstrndup(line + regmatch[6].rm_so,

                              regmatch[6].rm_eo - regmatch[6].rm_so);
          }
          if (regmatch[8].rm_so > 0) {
                              regmatch[6].rm_eo - regmatch[6].rm_so);
          }
          if (regmatch[8].rm_so > 0) {

-              value = strndup(line + regmatch[8].rm_so,
+              value = xstrndup(line + regmatch[8].rm_so,

                               regmatch[8].rm_eo - regmatch[8].rm_so);
          } else {
                               regmatch[8].rm_eo - regmatch[8].rm_so);
          } else {

-              value = strndup(line + regmatch[9].rm_so,
+              value = xstrndup(line + regmatch[9].rm_so,

                               regmatch[9].rm_eo - regmatch[9].rm_so);
          }
          extra = NULL;
          if (regmatch[11].rm_so > 0) {
                               regmatch[9].rm_eo - regmatch[9].rm_so);
          }
          extra = NULL;
          if (regmatch[11].rm_so > 0) {

-              extra = strndup (line + regmatch[11].rm_so,
+              extra = xstrndup (line + regmatch[11].rm_so,

                                regmatch[11].rm_eo - regmatch[11].rm_so);
          }
 
                                regmatch[11].rm_eo - regmatch[11].rm_so);
          }