Attachment #534530 for bug #658949

Attachment #534530: wip fix for bug #658949

View | Details | Raw Unified | Return to bug 658949
Collapse All | Expand All





    NS_ENSURE_TRUE(URI(), NS_ERROR_NOT_INITIALIZED);

    nsresult rv;

    nsCAutoString spec;
    rv = URI()->GetAsciiSpec(spec);
    if (NS_FAILED(rv)) return rv;

    nsCString contentType, contentCharset, dataBuffer, ref;
    PRBool lBase64;
    rv = nsDataHandler::ParseURI(spec, contentType, contentCharset,
                                 lBase64, dataBuffer, ref);

    // XXXdholbert What should we do with 'ref' here?

    NS_UnescapeURL(dataBuffer);

    if (lBase64) {
        // Don't allow spaces in base64-encoded content. This is only
        // relevant for escaped spaces; other spaces are stripped in
        // NewURI.
        dataBuffer.StripWhitespace();





        // Looks like a reference instead of a fully-specified URI.
        // --> initialize |uri| as a clone of |aBaseURI|, with ref appended.
        rv = aBaseURI->Clone(getter_AddRefs(uri));
        if (NS_FAILED(rv))
            return rv;
        rv = uri->SetRef(spec);
    } else {
        // Otherwise, we'll assume |spec| is a fully-specified data URI
        nsCAutoString contentType, contentCharset, dataBuffer, ref;
        PRBool base64;
        rv = ParseURI(spec, contentType, contentCharset, base64, dataBuffer, ref);
        if (NS_FAILED(rv))
            return rv;

        // Strip whitespace unless this is text, where whitespace is important
        // Don't strip escaped whitespace though (bug 391951)
        if (base64 || (strncmp(contentType.get(),"text/",5) != 0 &&
                       contentType.Find("xml") == kNotFound)) {
            // it's ascii encoded binary, don't let any spaces in
            spec.StripWhitespace();
        }

        uri = do_CreateInstance(kSimpleURICID, &rv);
        if (NS_FAILED(rv))
            return rv;

        rv = uri->SetSpec(spec);
        if (NS_FAILED(rv))
          return rv;

        rv = uri->SetRef(ref);
    }

    if (NS_FAILED(rv))
        return rv;

    uri.forget(result);
    return rv;
}

    return NS_OK;
}

nsresult
nsDataHandler::ParseURI(nsCString& spec,
                        nsCString& contentType,
                        nsCString& contentCharset,
                        PRBool&    isBase64,
                        nsCString& dataBuffer,
                        nsCString& hashRef) {
    isBase64 = PR_FALSE;

    // move past "data:"
    char *buffer = (char *) PL_strcasestr(spec.BeginWriting(), "data:");
    if (!buffer) {
        // malformed uri
        return NS_ERROR_MALFORMED_URI;
    }


    *comma = ',';
    if (isBase64)
        *base64 = ';';

    contentType.StripWhitespace();
    contentCharset.StripWhitespace();

    // Split encoded data from terminal "#ref" (if present)
    char *data = comma + 1;
    char *hash = strchr(data, '#');
    PRUint32 dataLen;
    if (!hash) {
        dataBuffer.Assign(data);
        hashRef.Truncate();
    } else {
        dataBuffer.Assign(data, hash - data);
        hashRef.Assign(hash);
    }

    return NS_OK;
}

(-)a/netwerk/protocol/data/nsDataHandler.h (-1 / +2 lines)

Line	Link Here

Lines 58-69 public:	Link Here

    // Parse a data: URI and return the individual parts

    // Parse a data: URI and return the individual parts

    // (the given spec will temporarily be modified but will be returned

    // (the given spec will temporarily be modified but will be returned

    //  to the original before returning)

    //  to the original before returning)

    static NS_HIDDEN_(nsresult) ParseURI(nsCString& spec,

    static NS_HIDDEN_(nsresult) ParseURI(nsCString& spec,

                                         nsCString& contentType,

                                         nsCString& contentType,

                                         nsCString& contentCharset,

                                         nsCString& contentCharset,

                                         PRBool&    isBase64,

                                         PRBool&    isBase64,

                                         nsCString& dataBuffer);

                                         nsCString& dataBuffer,

                                         nsCString& hashRef);

};

};

#endif /* nsDataHandler_h___ */

#endif /* nsDataHandler_h___ */

(-)a/netwerk/test/reftest/658949-1-ref.html (+1 lines)

Line	Link Here

Line 0	Link Here

<iframe src="data:text/html,ABC"></iframe>

(-)a/netwerk/test/reftest/658949-1.html (+1 lines)

Line	Link Here

Line 0	Link Here

<iframe src="data:text/html,ABC#myRef"></iframe>

(-)a/netwerk/test/reftest/reftest.list (-1 / +1 lines)

Line	Link Here

Lines 1-2	Link Here

== bug565432-1.html bug565432-1-ref.html

== bug565432-1.html bug565432-1-ref.html

== 658949-1.html 658949-1-ref.html

Return to bug 658949