← Back to branch summary

~ubuntu-branches/ubuntu/maverick/openssl/maverick

« back to all changes in this revision

Viewing changes to crypto/asn1/a_strex.c

  • Committer: Bazaar Package Importer
  • Author(s): Kurt Roeckx
  • Date: 2006-05-15 16:00:58 UTC
  • mto: (11.1.1 lenny)
  • mto: This revision was merged to the branch mainline in revision 6.
  • Revision ID: james.westby@ubuntu.com-20060515160058-pg6lnbkkpkwpdj2e
Tags: upstream-0.9.8b
Import upstream version 0.9.8b

Show diffs side-by-side

added added

removed removed

Lines of Context:
crypto/asn1/a_strex.c
194
194
                        if(i < 0) return -1;    /* Invalid UTF8String */
195
195
                        p += i;
196
196
                        break;
 
197
                        default:
 
198
                        return -1;      /* invalid width */
197
199
                }
198
200
                if (p == q) orflags = CHARTYPE_LAST_ESC_2253;
199
201
                if(type & BUF_TYPE_CONVUTF8) {
356
358
        }
357
359
 
358
360
        len = do_buf(str->data, str->length, type, flags, &quotes, io_ch, NULL);
359
 
        if(outlen < 0) return -1;
 
361
        if(len < 0) return -1;
360
362
        outlen += len;
361
363
        if(quotes) outlen += 2;
362
364
        if(!arg) return outlen;
363
365
        if(quotes && !io_ch(arg, "\"", 1)) return -1;
364
 
        do_buf(str->data, str->length, type, flags, NULL, io_ch, arg);
 
366
        if(do_buf(str->data, str->length, type, flags, NULL, io_ch, arg) < 0)
 
367
                return -1;
365
368
        if(quotes && !io_ch(arg, "\"", 1)) return -1;
366
369
        return outlen;
367
370
}