Changeset 234 for branches/samba-3.2.x/source/lib/charcnv.c

Timestamp:

May 27, 2009, 11:59:40 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.10

File:

• branches/samba-3.2.x/source/lib/charcnv.c (modified) (5 diffs)

branches/samba-3.2.x/source/lib/charcnv.c

@@ -243 +243 @@
                                 if (allow_bad_conv)
                                         goto use_as_is;
-                                break;
+                                return (size_t)-1;
                         case E2BIG:
                                 reason="No more room"; 
@@ -264 +264 @@
                                 if (allow_bad_conv)
                                         goto use_as_is;
-                                break;
+                                
+                                return (size_t)-1;
                         default:
                                 if (!conv_silent)
                                         DEBUG(0,("convert_string_internal: Conversion error: %s(%s)\n",reason,inbuf));
-                                break;
+                                return (size_t)-1;
                 }
                 /* smb_panic(reason); */
@@ -413 +414 @@
                                 goto general_case;
 #else
-                                return retval + convert_string_internal(from, to, p, slen, q, dlen, allow_bad_conv);
+                                size_t ret = convert_string_internal(from, to, p, slen, q, dlen, allow_bad_conv);
+                                if (ret == (size_t)-1) {
+                                        return ret;
+                                }
+                                return retval + ret;
 #endif
                         }
@@ -449 +454 @@
                                 goto general_case;
 #else
-                                return retval + convert_string_internal(from, to, p, slen, q, dlen, allow_bad_conv);
+                                size_t ret = convert_string_internal(from, to, p, slen, q, dlen, allow_bad_conv);
+                                if (ret == (size_t)-1) {
+                                        return ret;
+                                }
+                                return retval + ret;
 #endif
                         }
@@ -485 +494 @@
                                 goto general_case;
 #else
-                                return retval + convert_string_internal(from, to, p, slen, q, dlen, allow_bad_conv);
+                                size_t ret = convert_string_internal(from, to, p, slen, q, dlen, allow_bad_conv);
+                                if (ret == (size_t)-1) {
+                                        return ret;
+                                }
+                                return retval + ret;
 #endif
                         }