Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 01:48:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix race condition in method.

Browse Source
This commit is contained in:
nboyd%atg.com 2001-04-11 13:43:07 +00:00
parent 5425d1691b
commit dfea48c35c
2 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
js/rhino/org/mozilla/javascript/ScriptableObject.java
View File

@ -1724,26 +1724,27 @@ public abstract class ScriptableObject implements Scriptable {
}
private Object[] getIds(boolean getAll) {
if (slots == null)
return ScriptRuntime.emptyArgs;
int count = 0;
for (int i=slots.length-1; i >= 0; i--) {
Slot slot = slots[i];
Slot[] s = slots;
Object[] a = ScriptRuntime.emptyArgs;
if (s == null)
return a;
int c = 0;
for (int i=0; i < s.length; i++) {
Slot slot = s[i];
if (slot == null || slot == REMOVED)
continue;
if (getAll || (slot.attributes & DONTENUM) == 0)
count++;
}
Object[] result = new Object[count];
for (int i=slots.length-1; i >= 0; i--) {
Slot slot = slots[i];
if (slot == null || slot == REMOVED)
continue;
if (getAll || (slot.attributes & DONTENUM) == 0)
result[--count] = slot.stringKey != null
? (Object) slot.stringKey
: new Integer(slot.intKey);
if (getAll || (slot.attributes & DONTENUM) == 0) {
if (c == 0)
a = new Object[s.length - i];
a[c++] = slot.stringKey != null
? (Object) slot.stringKey
: new Integer(slot.intKey);
}
}
if (c == a.length)
return a;
Object[] result = new Object[c];
System.arraycopy(a, 0, result, 0, c);
return result;
}

35
js/rhino/src/org/mozilla/javascript/ScriptableObject.java
View File

@ -1724,26 +1724,27 @@ public abstract class ScriptableObject implements Scriptable {
}
private Object[] getIds(boolean getAll) {
if (slots == null)
return ScriptRuntime.emptyArgs;
int count = 0;
for (int i=slots.length-1; i >= 0; i--) {
Slot slot = slots[i];
Slot[] s = slots;
Object[] a = ScriptRuntime.emptyArgs;
if (s == null)
return a;
int c = 0;
for (int i=0; i < s.length; i++) {
Slot slot = s[i];
if (slot == null || slot == REMOVED)
continue;
if (getAll || (slot.attributes & DONTENUM) == 0)
count++;
}
Object[] result = new Object[count];
for (int i=slots.length-1; i >= 0; i--) {
Slot slot = slots[i];
if (slot == null || slot == REMOVED)
continue;
if (getAll || (slot.attributes & DONTENUM) == 0)
result[--count] = slot.stringKey != null
? (Object) slot.stringKey
: new Integer(slot.intKey);
if (getAll || (slot.attributes & DONTENUM) == 0) {
if (c == 0)
a = new Object[s.length - i];
a[c++] = slot.stringKey != null
? (Object) slot.stringKey
: new Integer(slot.intKey);
}
}
if (c == a.length)
return a;
Object[] result = new Object[c];
System.arraycopy(a, 0, result, 0, c);
return result;
}