diff options
| -rw-r--r-- | src/xplist.c | 8 | ||||
| -rw-r--r-- | tools/plistutil.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/xplist.c b/src/xplist.c index 537d315..dc70864 100644 --- a/src/xplist.c +++ b/src/xplist.c | |||
| @@ -749,7 +749,7 @@ static text_part_t* get_text_parts(parse_ctx ctx, const char* tag, size_t tag_le | |||
| 749 | } | 749 | } |
| 750 | } while (1); | 750 | } while (1); |
| 751 | ctx->pos++; | 751 | ctx->pos++; |
| 752 | if (ctx->pos >= ctx->end-tag_len || strncmp(ctx->pos, tag, tag_len)) { | 752 | if (ctx->pos >= ctx->end-tag_len || strncmp(ctx->pos, tag, tag_len) != 0) { |
| 753 | PLIST_XML_ERR("EOF or end tag mismatch\n"); | 753 | PLIST_XML_ERR("EOF or end tag mismatch\n"); |
| 754 | ctx->err++; | 754 | ctx->err++; |
| 755 | return NULL; | 755 | return NULL; |
| @@ -965,7 +965,7 @@ static void node_from_xml(parse_ctx ctx, plist_t *plist) | |||
| 965 | ctx->err++; | 965 | ctx->err++; |
| 966 | goto err_out; | 966 | goto err_out; |
| 967 | } | 967 | } |
| 968 | if (strncmp(ctx->pos, "?>", 2)) { | 968 | if (strncmp(ctx->pos, "?>", 2) != 0) { |
| 969 | PLIST_XML_ERR("Couldn't find <? tag closing marker\n"); | 969 | PLIST_XML_ERR("Couldn't find <? tag closing marker\n"); |
| 970 | ctx->err++; | 970 | ctx->err++; |
| 971 | goto err_out; | 971 | goto err_out; |
| @@ -977,7 +977,7 @@ static void node_from_xml(parse_ctx ctx, plist_t *plist) | |||
| 977 | if (((ctx->end - ctx->pos) > 3) && !strncmp(ctx->pos, "!--", 3)) { | 977 | if (((ctx->end - ctx->pos) > 3) && !strncmp(ctx->pos, "!--", 3)) { |
| 978 | ctx->pos += 3; | 978 | ctx->pos += 3; |
| 979 | find_str(ctx,"-->", 3, 0); | 979 | find_str(ctx,"-->", 3, 0); |
| 980 | if (ctx->pos > ctx->end-3 || strncmp(ctx->pos, "-->", 3)) { | 980 | if (ctx->pos > ctx->end-3 || strncmp(ctx->pos, "-->", 3) != 0) { |
| 981 | PLIST_XML_ERR("Couldn't find end of comment\n"); | 981 | PLIST_XML_ERR("Couldn't find end of comment\n"); |
| 982 | ctx->err++; | 982 | ctx->err++; |
| 983 | goto err_out; | 983 | goto err_out; |
| @@ -1006,7 +1006,7 @@ static void node_from_xml(parse_ctx ctx, plist_t *plist) | |||
| 1006 | } | 1006 | } |
| 1007 | if (embedded_dtd) { | 1007 | if (embedded_dtd) { |
| 1008 | find_str(ctx, "]>", 2, 1); | 1008 | find_str(ctx, "]>", 2, 1); |
| 1009 | if (ctx->pos > ctx->end-2 || strncmp(ctx->pos, "]>", 2)) { | 1009 | if (ctx->pos > ctx->end-2 || strncmp(ctx->pos, "]>", 2) != 0) { |
| 1010 | PLIST_XML_ERR("Couldn't find end of DOCTYPE\n"); | 1010 | PLIST_XML_ERR("Couldn't find end of DOCTYPE\n"); |
| 1011 | ctx->err++; | 1011 | ctx->err++; |
| 1012 | goto err_out; | 1012 | goto err_out; |
diff --git a/tools/plistutil.c b/tools/plistutil.c index bbce7c7..989db35 100644 --- a/tools/plistutil.c +++ b/tools/plistutil.c | |||
| @@ -274,7 +274,7 @@ int main(int argc, char *argv[]) | |||
| 274 | 274 | ||
| 275 | if (plist_out) | 275 | if (plist_out) |
| 276 | { | 276 | { |
| 277 | if (options->out_file != NULL && strcmp(options->out_file, "-")) | 277 | if (options->out_file != NULL && strcmp(options->out_file, "-") != 0) |
| 278 | { | 278 | { |
| 279 | FILE *oplist = fopen(options->out_file, "wb"); | 279 | FILE *oplist = fopen(options->out_file, "wb"); |
| 280 | if (!oplist) { | 280 | if (!oplist) { |
