Merge pull request #2338 from BogdanovKirill/httpwritefix3

[mono.git] / mono / io-layer / versioninfo.c

diff --git a/mono/io-layer/versioninfo.c b/mono/io-layer/versioninfo.c
index 2ba7fc96d5554ee1eaa5d1c7221aabaa020896ae..8a147e1f2e46c0a9fd9124814a548df3ccd2c1ec 100644 (file)
--- a/mono/io-layer/versioninfo.c
+++ b/mono/io-layer/versioninfo.c
@@ -468,11 +468,9 @@ static gconstpointer
 get_fixedfileinfo_block (gconstpointer data, version_data *block)
 {
        gconstpointer data_ptr;
-       gint32 data_len; /* signed to guard against underflow */
        WapiFixedFileInfo *ffi;
 
        data_ptr = get_versioninfo_block (data, block);
-       data_len = block->data_len;
                
        if (block->value_len != sizeof(WapiFixedFileInfo)) {
                DEBUG ("%s: FIXEDFILEINFO size mismatch", __func__);
@@ -903,7 +901,7 @@ VerQueryValue (gconstpointer datablock, const gunichar2 *subblock, gpointer *buf
                                            string_value != NULL &&
                                            string_value_len != 0) {
                                                *buffer = string_value;
-                                               *len = unicode_chars (string_value) + 1; /* Include trailing null */
+                                               *len = unicode_chars ((const gunichar2 *)string_value) + 1; /* Include trailing null */
                                                ret = TRUE;
                                                goto done;
                                        }